gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.git-annex: move input overrides to configuration-nix

Browse Source
This commit is contained in:
sternenseemann
2021-11-14 20:56:43 +01:00
committed by sterni
parent 3266c51421
commit 7d3dbec3cc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+1 -5
View File
@@ -74,11 +74,7 @@ self: super: {
rm -r $out/doc/?ndroid*
'';
};
} 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;
};
} super.git-annex);
# Fix test trying to access /home directory
shell-conduit = overrideCabal (drv: {
pkgs/development/haskell-modules/configuration-nix.nix
+5 -1
View File
@@ -535,7 +535,11 @@ self: super: builtins.intersectAttrs super {
buildTools = [
pkgs.buildPackages.makeWrapper
] ++ (drv.buildTools or []);
}) super.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;
});
# The test suite has undeclared dependencies on git.
githash = dontCheck super.githash;