nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting simons' r17618, which causes a major stdenv rebuild.

Browse Source 
svn path=/nixpkgs/trunk/; revision=17622
This commit is contained in:
Lluís Batlle i Rossell 2009-10-02 19:05:39 +00:00
parent 14433eb1e2
commit e5654ae80f
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/perl-5.10/default.nix
View File

@ -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
'';

8
pkgs/development/interpreters/perl-5.8/builder.sh
View File

@ -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

15
pkgs/top-level/all-packages.nix
View File

@ -2254,19 +2254,18 @@ let
inherit (bleedingEdgeRepos) sourceByName;
};
supportsPerl = stdenv.isLinux || system == "i686-darwin";
perl = if !stdenv.isLinux then sysPerl else perlReal;
perl = if !supportsPerl then sysPerl else
import ../development/interpreters/perl-5.10 {
fetchurl = fetchurlBoot;
inherit stdenv;
};
perl58 = if !supportsPerl then sysPerl else
perl58 = if !stdenv.isLinux then sysPerl else
import ../development/interpreters/perl-5.8 {
inherit fetchurl stdenv;
};
perlReal = import ../development/interpreters/perl-5.10 {
fetchurl = fetchurlBoot;
inherit stdenv;
};
# FIXME: unixODBC needs patching on Darwin (see darwinports)
phpOld = import ../development/interpreters/php {
inherit stdenv fetchurl flex bison libxml2 apacheHttpd;