diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-02 19:05:39 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-10-02 19:05:39 +0000 |
| commit | e5654ae80f56dfc9bddd296046ed1973f5385f04 (patch) | |
| tree | 668941497e22a6d4915da10a6f679affdc726305 /pkgs/development | |
| parent | 14433eb1e2bdcc45762460b7dcf56159ba6d686c (diff) | |
| download | nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar.gz nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar.bz2 nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar.lz nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar.xz nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.tar.zst nixlib-e5654ae80f56dfc9bddd296046ed1973f5385f04.zip | |
Reverting simons' r17618, which causes a major stdenv rebuild.
svn path=/nixpkgs/trunk/; revision=17622
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/interpreters/perl-5.10/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/interpreters/perl-5.8/builder.sh | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/pkgs/development/interpreters/perl-5.10/default.nix b/pkgs/development/interpreters/perl-5.10/default.nix index 8f7908a80979..a8b8dd536a75 100644 --- a/pkgs/development/interpreters/perl-5.10/default.nix +++ b/pkgs/development/interpreters/perl-5.10/default.nix @@ -34,14 +34,10 @@ stdenv.mkDerivation { preConfigure = '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - + if test "$NIX_ENFORCE_PURITY" = "1"; then - case $system in - *-linux) LIBC=$(cat $NIX_GCC/nix-support/orig-libc) ;; - *-darwin) LIBC=/usr ;; - *) echo unsupported system $system; exit 1 ;; - esac - configureFlags="$configureFlags -Dlocincpth=$LIBC/include -Dloclibpth=$LIBC/lib" + GLIBC=$(cat $NIX_GCC/nix-support/orig-libc) + configureFlags="$configureFlags -Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" fi ''; diff --git a/pkgs/development/interpreters/perl-5.8/builder.sh b/pkgs/development/interpreters/perl-5.8/builder.sh index 500de901e174..79458b3249b6 100644 --- a/pkgs/development/interpreters/perl-5.8/builder.sh +++ b/pkgs/development/interpreters/perl-5.8/builder.sh @@ -1,12 +1,8 @@ source $stdenv/setup if test "$NIX_ENFORCE_PURITY" = "1"; then - case $system in - *-linux) LIBC=$(cat $NIX_GCC/nix-support/orig-libc) ;; - *-darwin) LIBC=/usr ;; - *) echo unsupported system $system; exit 1 ;; - esac - extraflags="-Dlocincpth=$LIBC/include -Dloclibpth=$LIBC/lib" + GLIBC=$(cat $NIX_GCC/nix-support/orig-libc) + extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" fi configureScript=./Configure |