From 0d685d9ebec03cc13c8731a87b0f51c28a7c2de8 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Sun, 30 Jul 2006 17:07:15 +0000 Subject: [PATCH] move NIX_GLIBC_FLAGS_SET=1 to the dietlibc-wrapper svn path=/nixpkgs/trunk/; revision=5992 --- pkgs/os-specific/linux/dietlibc-wrapper/builder.sh | 3 +-- pkgs/tools/misc/coreutils-diet/default.nix | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh b/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh index 5f941e2e704..976cebada83 100644 --- a/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh +++ b/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh @@ -1,11 +1,10 @@ source $stdenv/setup -#export NIX_GLIBC_FLAGS_SET=1 - ensureDir "$(dirname $out/bin/diet)" cat > $out/bin/gcc << END #! $SHELL -e +export NIX_GLIBC_FLAGS_SET=1 exec $dietlibc/bin/diet $gcc/bin/gcc "\$@" END diff --git a/pkgs/tools/misc/coreutils-diet/default.nix b/pkgs/tools/misc/coreutils-diet/default.nix index 82bfd235669..d372c7ec949 100644 --- a/pkgs/tools/misc/coreutils-diet/default.nix +++ b/pkgs/tools/misc/coreutils-diet/default.nix @@ -11,6 +11,5 @@ stdenv.mkDerivation { patches = [./coreutils-dummy.patch]; buildInputs = [perl]; NIX_GCC = dietgcc; - NIX_GLIBC_FLAGS_SET=1; NIX_CFLAGS_COMPILE="-D_BSD_SOURCE=1"; }