From 9cc65f6893077883ee97f1462a156235ba422427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 2 Jan 2013 20:01:49 +0100 Subject: [PATCH] Setting coreutils to 8.20 for linux, 8.19 for darwin As Eelco noted in 0ecd1f62c799dffbdbd4bc1ba8120bfb4a4c7a6f, Darwin can't build 8.20. But linux can't build 8.19 now. --- pkgs/top-level/all-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f30b298086..7b6bf23c60b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -570,10 +570,15 @@ let convmv = callPackage ../tools/misc/convmv { }; - coreutils = callPackage ../tools/misc/coreutils { - # TODO: Add ACL support for cross-Linux. - aclSupport = crossSystem == null && stdenv.isLinux; - }; + coreutils = if stdenv.isDarwin then + # 8.20 doesn't build on Darwin + (callPackage ../tools/misc/coreutils/8.19) + else + (callPackage ../tools/misc/coreutils) + { + # TODO: Add ACL support for cross-Linux. + aclSupport = crossSystem == null && stdenv.isLinux; + }; cpio = callPackage ../tools/archivers/cpio { };