summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2014-07-18 18:37:54 -0500
committerJohn Wiegley <johnw@newartisans.com>2014-07-18 18:37:54 -0500
commit73e0c50b304e2a437a635f4f9b92725094b5bfd0 (patch)
treeb2165817508f85c244487ecf344e450c16234fa0 /pkgs/applications/version-management/git-and-tools
parentad31933ec41cec2744ac9dd443524932887e8342 (diff)
downloadnixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar.gz
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar.bz2
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar.lz
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar.xz
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.tar.zst
nixlib-73e0c50b304e2a437a635f4f9b92725094b5bfd0.zip
haskell-git-annex: fix for darwin
@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?
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-annex/default.nix26
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 07b09d37a2fd..8fe78d6f825d 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 @@
 , tastyQuickcheck, 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 pathPieces QuickCheck random regexTdfa
@@ -33,19 +34,14 @@ cabal.mkDerivation (self: {
     tastyQuickcheck 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"