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

git-annex: Allow building on darwin again

Browse Source
This commit is contained in:
John Wiegley 2014-07-09 17:50:56 -05:00
parent eb659e89b4
commit a25c35b89b
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
, SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck , SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck
, tastyRerun, text, time, transformers, unixCompat, utf8String , tastyRerun, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod , uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic , yesodCore, yesodDefault, yesodForm, yesodStatic, fsnotify
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -21,9 +21,9 @@ cabal.mkDerivation (self: {
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
aeson async blazeBuilder bloomfilter byteable caseInsensitive aeson async blazeBuilder bloomfilter byteable caseInsensitive
clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus clientsession cryptoApi cryptohash dataDefault dataenc DAV
dlist dns editDistance exceptions extensibleExceptions fdoNotify dlist dns editDistance exceptions extensibleExceptions
feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient feed filepath gnutls hamlet hS3 hslogger HTTP httpClient
httpConduit httpTypes IfElse json liftedBase MissingH monadControl httpConduit httpTypes IfElse json liftedBase MissingH monadControl
mtl network networkInfo networkMulticast networkProtocolXmpp mtl network networkInfo networkMulticast networkProtocolXmpp
optparseApplicative QuickCheck random regexTdfa SafeSemaphore optparseApplicative QuickCheck random regexTdfa SafeSemaphore
@ -31,19 +31,13 @@ cabal.mkDerivation (self: {
tastyRerun text time transformers unixCompat utf8String uuid wai tastyRerun text time transformers unixCompat utf8String uuid wai
waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic yesodForm yesodStatic
]; ] ++ (if (!self.stdenv.isDarwin) then [
dbus fdoNotify hinotify
] else [
fsnotify
]);
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3 configureFlags = "-fAssistant -fProduction";
-fWebDAV
-fInotify
-fDbus
-fAssistant
-fWebapp
-fPairing
-fXMPP
-fDNS
-fProduction
-fTDFA";
preConfigure = '' preConfigure = ''
export HOME="$NIX_BUILD_TOP/tmp" export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME" mkdir "$HOME"