about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2015-12-16 16:20:44 -0800
committerJohn Wiegley <johnw@newartisans.com>2015-12-16 16:20:44 -0800
commit61176d89873543ab0c805b1d193c078a6bc34c4a (patch)
tree8d576d7a2317fe575ed2fa9611aa2cc573ac4eed /pkgs/development/haskell-modules/configuration-common.nix
parent3725d5afdcf48cd141726fd376fac0ef9491e39a (diff)
downloadnixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar.gz
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar.bz2
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar.lz
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar.xz
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.tar.zst
nixlib-61176d89873543ab0c805b1d193c078a6bc34c4a.zip
Revert "haskellPackages.git-annex: Do not use lsof on Darwin"
This reverts commit fd45c7b82b65c31a5be7854d8566260b781c6d6b.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4a164beb2468..f7fe236da350 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -66,13 +66,11 @@ 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;
   };