From 8ad8eb6ee013f4729feb62c6da39b0ba0f0aafd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 3 Apr 2013 11:27:12 +0200 Subject: [PATCH] glibc: hurd: apply none of the patches --- pkgs/development/libraries/glibc/2.17/common.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index 9c1a43a97d7..413a0d7aae8 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -31,13 +31,11 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; - patches = - [ /* Have rpcgen(1) look for cpp(1) in $PATH. - On GNU/Hurd, use the old version of the patch since the new one - doesn't apply. */ - (if hurdHeaders != null - then ../2.13/rpcgen-path.patch - else ./rpcgen-path.patch) + /* Don't try to apply these patches to the Hurd's snapshot, which is + older. */ + patches = stdenv.lib.optionals (hurdHeaders == null) + [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ + ./rpcgen-path.patch /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch