From b6811b43f1b1f35fb7e2961e7c305a43ee9caab2 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Fri, 25 Aug 2006 22:19:16 +0000 Subject: [PATCH] pass noSysDirs for static gcc svn path=/nixpkgs/trunk/; revision=6246 --- pkgs/development/compilers/gcc-static-3.4/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-static-3.4/default.nix b/pkgs/development/compilers/gcc-static-3.4/default.nix index f5783555d66d..1b3c473d1e88 100644 --- a/pkgs/development/compilers/gcc-static-3.4/default.nix +++ b/pkgs/development/compilers/gcc-static-3.4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, noSysDirs}: stdenv.mkDerivation { name = "gcc-static-3.4.6"; @@ -9,5 +9,5 @@ stdenv.mkDerivation { }; # !!! apply only if noSysDirs is set patches = [./no-sys-dirs.patch]; - noSysDirs = 1; + inherit noSysDirs; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a26c4e897cb..0d6252ba53ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -630,7 +630,7 @@ rec { gcc = useFromStdenv (stdenv ? gcc) stdenv.gcc gcc41; gcc_static = (import ../development/compilers/gcc-static-3.4) { - inherit fetchurl stdenv; + inherit fetchurl stdenv noSysDirs; }; dietgcc = (import ../build-support/gcc-wrapper) {