alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fixing the logic in coreutils to avoid stdenv rebuild.

Browse source 
It was using 'null' instead of '[]' in case of no patches. So I change
it to provide 'null'.
This commit is contained in:
Lluís Batlle i Rossell 2015-11-04 12:41:35 +01:00
parent 1b36f489b6
commit 56ff659e5d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/misc/coreutils/default.nix
View file

@ -19,12 +19,12 @@ let
sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2";
};
patches = (optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch) ++
(optional stdenv.isArm (fetchurl {
patches = if stdenv.isCygwin then ./coreutils-8.23-4.cygwin.patch else
(if stdenv.isArm then (fetchurl {
url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
name = "coreutils-tail-inotify-race.patch";
}));
}) else null);
# The test tends to fail on btrfs and maybe other unusual filesystems.
postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''