From 26308ade6d4ba9eac49c527e2afc3c13d053e192 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 10 May 2019 13:36:24 -0700 Subject: remove cmdtree submodule, just replace the cfg file instead --- packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'packages.nix') diff --git a/packages.nix b/packages.nix index 75a3f15..1d397cc 100644 --- a/packages.nix +++ b/packages.nix @@ -2,7 +2,23 @@ with pkgs; let - cmdtree = import ./cmdtree { nixpkgs = pkgs; }; + cmdtree = stdenv.mkDerivation { + name = "cmdtree"; + src = fetchGit { + url = "https://git.sr.ht/~jb55/cmdtree"; + ref = "master"; + rev = "5606078e8fa02462f0208d9f9cad98c7673812e6"; + }; + buildPhase = '' + cp ${./cfg.def.h} ./cfg.def.h + make + ''; + installPhase = '' + mkdir -p $out/bin + cp ./cmdtree $out/bin + ''; + buildInputs = [ pkgs.xorg.libX11 pkgs.xorg.libXft ]; + }; in [ ag -- cgit v1.2.3