diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-18 22:27:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-09-18 22:27:20 +0200 |
commit | f32e964cc44de8b4259873be383f6ba60af4ec1e (patch) | |
tree | 28049b8e968a4394f00df43f35920e0595edc6f2 /pkgs/development/interpreters/perl | |
parent | 151da1950e6c6239ffe5a5143d9fddeac6b9f645 (diff) |
perl: Fix assertion failure on Darwin
This assertion doesn't make sense to me, because a multi-threaded build on Darwin works fine, despite not having Glibc.
Diffstat (limited to 'pkgs/development/interpreters/perl')
-rw-r--r-- | pkgs/development/interpreters/perl/5.16/default.nix | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index b8fd5a73ab9db..d7d6b54e94a26 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -1,16 +1,4 @@ -{ stdenv, fetchurl, enableThreading ? true }: - -# We can only compile perl with threading on platforms where we have a -# real glibc in the stdenv. -# -# Instead of silently building an unthreaded perl if this is not the -# case, we force callers to disableThreading explicitly, therefore -# documenting the platforms where the perl is not threaded. -# -# In the case of stdenv linux boot stage1 it's not possible to use -# threading because of the simpleness of the bootstrap glibc, so we -# use enableThreading = false there. -assert enableThreading -> (stdenv ? glibc); +{ lib, stdenv, fetchurl, enableThreading ? true }: let @@ -18,10 +6,6 @@ let in -with { - inherit (stdenv.lib) optional optionalString; -}; - stdenv.mkDerivation rec { name = "perl-5.16.3"; @@ -37,8 +21,8 @@ stdenv.mkDerivation rec { ./fixed-man-page-date.patch ./no-date-in-perl-binary.patch ] - ++ optional stdenv.isSunOS ./ld-shared.patch - ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; + ++ lib.optional stdenv.isSunOS ./ld-shared.patch + ++ lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; # Build a thread-safe Perl with a dynamic libperls.o. We need the # "installstyle" option to ensure that modules are put under @@ -54,7 +38,7 @@ stdenv.mkDerivation rec { "-Dlocincpth=${libc}/include" "-Dloclibpth=${libc}/lib" ] - ++ optional enableThreading "-Dusethreads"; + ++ lib.optional enableThreading "-Dusethreads"; configureScript = "${stdenv.shell} ./Configure"; @@ -66,18 +50,18 @@ stdenv.mkDerivation rec { '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - ${optionalString stdenv.isArm '' + ${lib.optionalString stdenv.isArm '' configureFlagsArray=(-Dldflags="-lm -lrt") ''} - ${optionalString stdenv.isCygwin '' + ${lib.optionalString stdenv.isCygwin '' cp cygwin/cygwin.c{,.bak} echo "#define PERLIO_NOT_STDIO 0" > tmp cat tmp cygwin/cygwin.c.bak > cygwin/cygwin.c ''} ''; - preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + preBuild = lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) '' # Make Cwd work on NixOS (where we don't have a /bin/pwd). substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" |