From 4d8cd0aa241c0949edf3b574b6509732249ed76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 29 Mar 2013 22:04:25 +0100 Subject: [PATCH] glibc: hurd: Use the old `rpcgen-path.patch'. --- pkgs/development/libraries/glibc/2.17/common.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index fb4083066de..9c1a43a97d7 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -32,14 +32,17 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; patches = - [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ - ./rpcgen-path.patch + [ /* 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) /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch - /* Don't use /etc/ld.so.cache, for non-NixOS systems. Currently - disabled on GNU/Hurd, which uses a more recent libc snapshot. */ + /* Don't use /etc/ld.so.cache, for non-NixOS systems. */ ./dont-use-system-ld-so-cache.patch /* Without this patch many KDE binaries crash. */