diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-13 10:41:10 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-13 10:41:10 +0000 |
| commit | 9edc2574dd66198d9cb66e153cf5d370213ebdf2 (patch) | |
| tree | d4d33ebffe7e31296e55e37675af033b9832509c /pkgs/applications/version-management/git-and-tools | |
| parent | d6f364ca8c723dfd52d0063353e603f1f7bb6c9f (diff) | |
| download | nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar.gz nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar.bz2 nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar.lz nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar.xz nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.tar.zst nixpkgs-9edc2574dd66198d9cb66e153cf5d370213ebdf2.zip | |
git-annex: the build system uses 'which' to determine whether ikiwiki is installed
svn path=/nixpkgs/trunk/; revision=27747
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e049c01869d..506076543f0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -46,7 +46,7 @@ rec { }; gitAnnex = lib.makeOverridable (import ./git-annex) { - inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki; + inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc HTTP testpack; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 52b4161a0f7..262759a5bb2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String -, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki }: +, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }: let version = "3.20110705"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight - SHA dataenc HTTP testpack git ikiwiki]; + SHA dataenc HTTP testpack git ikiwiki which]; checkTarget = "test"; doCheck = true; |