From 01bc9204e004a517a93d07e6f5790e0d5a094fcd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 22 Jun 2013 15:41:11 +0200 Subject: [PATCH] git-annex: fix installation of git-annex-shell --- .../version-management/git-and-tools/git-annex/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 5086f4f31b3..9991a506485 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 @@ -7,8 +7,8 @@ , monadControl, mtl, network, networkInfo, networkMulticast , networkProtocolXmpp, openssh, QuickCheck, random, regexTdfa , rsync, SafeSemaphore, SHA, stm, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiLogger, warp, xmlConduit -, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic +, unixCompat, utf8String, uuid, wai, waiLogger, warp, which +, xmlConduit, xmlTypes, yesod, yesodDefault, yesodForm, yesodStatic }: cabal.mkDerivation (self: { @@ -28,7 +28,7 @@ cabal.mkDerivation (self: { uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic ]; - buildTools = [ bup curl git gnupg1 lsof openssh rsync ]; + buildTools = [ bup curl git gnupg1 lsof openssh rsync which ]; configureFlags = "-fS3 -fWebDAV -fInotify @@ -41,6 +41,7 @@ cabal.mkDerivation (self: { -fProduction -fTDFA"; preConfigure = "patchShebangs ."; + installPhase = "make PREFIX=$out CABAL=./Setup docs install"; checkPhase = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME"