From 9edc2574dd66198d9cb66e153cf5d370213ebdf2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 Jul 2011 10:41:10 +0000 Subject: git-annex: the build system uses 'which' to determine whether ikiwiki is installed svn path=/nixpkgs/trunk/; revision=27747 --- pkgs/applications/version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools') 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; -- cgit 1.4.1