From 233aca358fee1f037acc20838caa9e71b4c26a19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 May 2013 13:43:47 +0200 Subject: [PATCH] checkinstall: Fix build on i686-linux http://hydra.nixos.org/build/4844549 --- pkgs/tools/package-management/checkinstall/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index a2b9c11eb09d..f3153100008f 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -29,11 +29,12 @@ stdenv.mkDerivation { # Fix a `conflicting types for 'scandir'' error on Glibc 2.11. ./scandir.patch + ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") # Force use of old memcpy so that installwatch works on Glibc < # 2.14. - ./use-old-memcpy.patch - ]; + ./use-old-memcpy.patch; buildInputs = [gettext];