From fbaf6dcbb0610a418763ee799fee0aeff03e6c78 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 4 Feb 2015 12:57:20 +0100 Subject: [PATCH] git-annex: fix build on Darwin --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c57cab599922..8d4a84034f93 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -36,8 +36,12 @@ self: super: { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; - # "curl" means pkgs.curl - git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; }; + # These changes are required to support Darwin. + git-annex = super.git-annex.override { + dbus = if pkgs.stdenv.isLinux then self.dbus else null; + fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; + hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify; + }; # Depends on code distributed under a non-free license. bindings-yices = dontDistribute super.bindings-yices;