summary refs log tree commit diff
path: root/pkgs/development/interpreters/perl
diff options
context:
space:
mode:
authorJude Taylor <me@jude.bio>2015-11-06 17:44:02 -0800
committerJude Taylor <me@jude.bio>2015-11-19 11:31:06 -0800
commit914e9baefe9b606ed331ba427af50c41715f973d (patch)
treeaaf1afe2ffc94e9235330b0af168d0cd7778a351 /pkgs/development/interpreters/perl
parentc296f64f196bbd69c4fdc336d17b553f3845cb1c (diff)
downloadnixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar.gz
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar.bz2
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar.lz
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar.xz
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.tar.zst
nixpkgs-914e9baefe9b606ed331ba427af50c41715f973d.zip
start on sandbox stuff
Diffstat (limited to 'pkgs/development/interpreters/perl')
-rw-r--r--pkgs/development/interpreters/perl/5.16/default.nix2
-rw-r--r--pkgs/development/interpreters/perl/5.20/default.nix6
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 568025edfd4..8a89d97a100 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     pwd="$(type -P pwd)"
     substituteInPlace dist/Cwd/Cwd.pm \
       --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
+    grep -R /bin/pwd .
+    exit 1
   '';
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 141484814ea..b2f43d176e8 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -44,12 +44,14 @@ stdenv.mkDerivation rec {
   # while at the same time erasing the PATH environment variable so it unconditionally
   # fails. The code in question is guarded by a check for Mac OS, but the patch below
   # doesn't have any runtime effect on other platforms.
-  postPatch = stdenv.lib.optional (stdenv.isDarwin && !stdenv.cc.nativeLibc) ''
+  postPatch = stdenv.lib.optional stdenv.isDarwin ''
     pwd="$(type -P pwd)"
     substituteInPlace dist/PathTools/Cwd.pm \
-      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
+      --replace "/bin/pwd" "$pwd"
   '';
 
+  __sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem";
+
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out