diff options
author | John Wiegley <johnw@newartisans.com> | 2014-06-10 02:28:23 +0000 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-06-10 02:28:23 +0000 |
commit | d0365a6cde538525ed37ee7b60fbd789a2ff7325 (patch) | |
tree | 068604e8b314669e377a2a27683145d3a1c6a831 /pkgs/applications/version-management/git-and-tools | |
parent | 7ebe9b1e16de530ba97eec4618b31f0f19604a33 (diff) | |
download | nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar.gz nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar.bz2 nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar.lz nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar.xz nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.tar.zst nixlib-d0365a6cde538525ed37ee7b60fbd789a2ff7325.zip |
git-annex: build on Darwin, and rely on cabal to set flags
Fixes #2519
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 23 |
1 files changed, 7 insertions, 16 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 217e4067cb94..788c3c3211b2 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 @@ -11,7 +11,7 @@ , tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers , unixCompat, utf8String, uuid, wai, waiLogger, warp, warpTls , which, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm -, yesodStatic +, yesodStatic, fsnotify }: cabal.mkDerivation (self: { @@ -22,9 +22,9 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ aeson async blazeBuilder bloomfilter byteable caseInsensitive - clientsession cryptoApi cryptohash dataDefault dataenc DAV dbus - dlist dns editDistance exceptions extensibleExceptions fdoNotify - feed filepath gnutls hamlet hinotify hS3 hslogger HTTP httpClient + clientsession cryptoApi cryptohash dataDefault dataenc DAV + dlist dns editDistance exceptions extensibleExceptions + feed filepath gnutls hamlet hS3 hslogger HTTP httpClient httpConduit httpTypes IfElse json liftedBase MissingH monadControl mtl network networkConduit networkInfo networkMulticast networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa @@ -32,19 +32,10 @@ cabal.mkDerivation (self: { tastyQuickcheck tastyRerun text time transformers unixCompat utf8String uuid wai waiLogger warp warpTls xmlTypes yesod yesodCore yesodDefault yesodForm yesodStatic - ]; + ] ++ (if !self.stdenv.isDarwin + then [ dbus fdoNotify hinotify ] else [ fsnotify ]); buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; - configureFlags = "-fS3 - -fWebDAV - -fInotify - -fDbus - -fAssistant - -fWebapp - -fPairing - -fXMPP - -fDNS - -fProduction - -fTDFA"; + configureFlags = "-fAssistant -fProduction"; preConfigure = '' export HOME="$NIX_BUILD_TOP/tmp" mkdir "$HOME" |