mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Revert "haskellPackages.git-annex: Do not use lsof on Darwin"
This reverts commit fd45c7b82b
.
This commit is contained in:
parent
3725d5afdc
commit
61176d8987
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user