diff options
author | John Wiegley <johnw@newartisans.com> | 2014-07-09 17:50:56 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-07-09 17:52:18 -0500 |
commit | a25c35b89b40557bb74299ad2a00649844bf90a6 (patch) | |
tree | 6dcb42a97b9834cb31a02293a5dc38613f1dd8cb /pkgs/applications/version-management | |
parent | eb659e89b41efae33b4b68a23c238b662d13e541 (diff) | |
download | nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar.gz nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar.bz2 nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar.lz nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar.xz nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.tar.zst nixpkgs-a25c35b89b40557bb74299ad2a00649844bf90a6.zip |
git-annex: Allow building on darwin again
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-annex/default.nix | 26 |
1 files changed, 10 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 35856b90ea5..59bcda0c29e 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 @@ -10,7 +10,7 @@ , SHA, shakespeare, stm, tasty, tastyHunit, tastyQuickcheck , tastyRerun, text, time, transformers, unixCompat, utf8String , uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod -, yesodCore, yesodDefault, yesodForm, yesodStatic +, yesodCore, yesodDefault, yesodForm, yesodStatic, fsnotify }: cabal.mkDerivation (self: { @@ -21,9 +21,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 networkInfo networkMulticast networkProtocolXmpp optparseApplicative QuickCheck random regexTdfa SafeSemaphore @@ -31,19 +31,13 @@ cabal.mkDerivation (self: { tastyRerun text time transformers unixCompat utf8String uuid wai waiExtra 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" |