diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-24 09:19:43 +0200 |
commit | 7db611f2af869bac6e31ba814a5593c52d54ec19 (patch) | |
tree | ccb2231a8e0500eaeac92ac9f7a4a7f0c674ea43 /pkgs/development/interpreters | |
parent | 8987547106fcc1868cbc05fb295e0631d8edf138 (diff) | |
parent | e78fd235649e52180198f9f65ca9f172f8fe8161 (diff) | |
download | nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.gz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.bz2 nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.lz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.xz nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.tar.zst nixpkgs-7db611f2af869bac6e31ba814a5593c52d54ec19.zip |
Merge branch 'staging'
Includes libX11 security update.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/perl/default.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 765487fc650..ec4f971eeef 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -97,12 +97,6 @@ let sed -i 's,\(libswanted.*\)pthread,\1,g' Configure ''; - preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - setupHook = ./setup-hook.sh; passthru.libPrefix = "lib/perl5/site_perl"; |