diff options
author | Peter Simons <simons@cryp.to> | 2015-02-04 12:57:20 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-02-04 14:53:58 +0100 |
commit | fbaf6dcbb0610a418763ee799fee0aeff03e6c78 (patch) | |
tree | a581398ca7afe5e6d10927c1b3463c0d110b4667 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 638ea434cb35ef6d33e789fe4a8363eac00faa43 (diff) | |
download | nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar.gz nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar.bz2 nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar.lz nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar.xz nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.tar.zst nixpkgs-fbaf6dcbb0610a418763ee799fee0aeff03e6c78.zip |
git-annex: fix build on Darwin
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c57cab59992..8d4a84034f9 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; |