BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "haskellPackages.git-annex: Do not use lsof on Darwin"

Browse source 
This reverts commit fd45c7b82b.
This commit is contained in:
John Wiegley 2015-12-16 16:20:44 -08:00
parent 3725d5afdc
commit 61176d8987
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -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;
};