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

haskell-git-annex: fix for darwin

Browse Source 
@peti I don't see in the cabal2nix repository how to change the
buildDepends for git-annex the way that I need to.  Can you offer some
guidance there?
This commit is contained in:
John Wiegley 2014-07-18 18:37:54 -05:00
parent ad31933ec4
commit 73e0c50b30
1 changed files with 11 additions and 15 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

@ -13,6 +13,7 @@
, tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat , tastyQuickcheck, tastyRerun, text, time, transformers, unixCompat
, utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes , utf8String, uuid, wai, waiExtra, warp, warpTls, which, xmlTypes
, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic , yesod, yesodCore, yesodDefault, yesodForm, yesodStatic
, fsnotify
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -23,9 +24,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 pathPieces QuickCheck random regexTdfa optparseApplicative pathPieces QuickCheck random regexTdfa
@ -33,19 +34,14 @@ cabal.mkDerivation (self: {
tastyQuickcheck tastyRerun text time transformers unixCompat tastyQuickcheck tastyRerun text time transformers unixCompat
utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore utf8String uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore
yesodDefault yesodForm yesodStatic yesodDefault yesodForm yesodStatic
]; ] ++ (if self.stdenv.isDarwin then [
fsnotify
] else [
dbus fdoNotify hinotify
]);
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3 configureFlags = "-fAssistant
-fWebDAV -fProduction";
-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"