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

git-annex: build on Darwin, and rely on cabal to set flags

Browse Source 
Fixes #2519
This commit is contained in:
John Wiegley 2014-06-10 02:28:23 +00:00
parent 7ebe9b1e16
commit d0365a6cde
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers
, unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls , unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls
, which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm , which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm
, yesodStatic , yesodStatic, fsnotify
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -22,9 +22,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 networkConduit networkInfo networkMulticast mtl network networkConduit networkInfo networkMulticast
networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa
@ -32,19 +32,10 @@ cabal.mkDerivation (self: {
tastyQuickcheck tastyRerun text time transformers unixCompat tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic yesodDefault 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"