diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-07-16 01:27:29 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-07-16 01:27:29 -0500 |
| commit | d24df6e3349347b72194c85d8b267e296e53dd80 (patch) | |
| tree | 2f13d0bfce452140c3c5fd796762dbe690f34c5e /pkgs/applications/version-management | |
| parent | e33525a13903050fad2b456cdc3380c9c6e4e84d (diff) | |
| download | nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar.gz nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar.bz2 nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar.lz nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar.xz nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.tar.zst nixpkgs-d24df6e3349347b72194c85d8b267e296e53dd80.zip | |
haskell-git-annex: corrections for darwin
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, 11 insertions, 15 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 6764c232bd8..0983ca91386 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 @@ -13,6 +13,7 @@ , tastyRerun, text, time, transformers, unixCompat, utf8String , uuid, wai, waiExtra, warp, warpTls, which, xmlTypes, yesod , yesodCore, yesodDefault, yesodForm, yesodStatic +, fsnotify }: cabal.mkDerivation (self: { @@ -23,9 +24,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 @@ -33,19 +34,14 @@ 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 [ + fsnotify + ] else [ + dbus fdoNotify hinotify + ]); 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" |