summary refs log tree commit diff
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-12-16 14:10:45 -0800
committerJohn Wiegley <johnw@newartisans.com>2015-12-16 14:10:56 -0800
commitfd45c7b82b65c31a5be7854d8566260b781c6d6b (patch)
tree68ad00c57248650cfab69d140d008d42af11d7c8
parent2cd323a51a6f1657c57003dec47181d01733416f (diff)
downloadnixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar.gz
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar.bz2
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar.lz
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar.xz
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.tar.zst
nixpkgs-fd45c7b82b65c31a5be7854d8566260b781c6d6b.zip
haskellPackages.git-annex: Do not use lsof on Darwin
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ad80220549a..41fdfad528a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -66,11 +66,13 @@ self: super: {
   # build which has the assistant to be used in the top-level.
   git-annex_5_20150727 = (disableCabalFlag super.git-annex_5_20150727 "assistant").override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+    lsof = if pkgs.stdenv.isLinux then self.lsof 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;
   };
   git-annex = (disableCabalFlag super.git-annex "assistant").override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;
+    lsof = if pkgs.stdenv.isLinux then self.lsof 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;
   };