summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2017-01-07 08:05:02 +0100
committerGitHub <noreply@github.com>2017-01-07 08:05:02 +0100
commitf1dc2dd552a7db4a9010f8cbe9f02a2243092619 (patch)
tree5075c5fec6734b1946e808caf0567642ede1f9bd /pkgs/applications/networking/instant-messengers
parent0f24e5672805bbda94e3a0c1dadeb28d941d472e (diff)
parent3f9cb55dce4b1e006c13f5423b368b9282d65db9 (diff)
downloadnixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar.gz
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar.bz2
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar.lz
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar.xz
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.tar.zst
nixlib-f1dc2dd552a7db4a9010f8cbe9f02a2243092619.zip
Merge pull request #21694 from dtzWill/fix/skype-pax
skype: paxmark to fix execution on PaX-enabled kernels
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r--pkgs/applications/networking/instant-messengers/skype/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix
index 5bb2121b1fda..a84b9cbf31c1 100644
--- a/pkgs/applications/networking/instant-messengers/skype/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skype/default.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{libexec/skype/,bin}
     cp -r * $out/libexec/skype/
 
+    # Fix execution on PaX-enabled kernels
+    paxmark m $out/libexec/skype/skype
+
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
         --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype