public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-annex: the build system uses 'which' to determine whether ikiwiki is installed

Browse Source 
svn path=/nixpkgs/trunk/; revision=27747
This commit is contained in:
Peter Simons 2011-07-13 10:41:10 +00:00
parent d6f364ca8c
commit 9edc2574dd
2 changed files with 3 additions and 3 deletions
pkgs/applications/version-management/git-and-tools
default.nix
git-annex
default.nix

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -46,7 +46,7 @@ rec {
}; };
gitAnnex = lib.makeOverridable (import ./git-annex) { 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 inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
HTTP testpack; HTTP testpack;
}; };

4
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String { 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 let
version = "3.20110705"; version = "3.20110705";
@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight 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"; checkTarget = "test";
doCheck = true; doCheck = true;