diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-21 03:23:41 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-21 03:23:41 +0400 |
| commit | dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929 (patch) | |
| tree | 6d43b1e15de7a8e7a9d3f35f3c11689600d06349 /pkgs | |
| parent | 8262cd0244fb8549571b983f4f688125c3b3b4bd (diff) | |
| parent | 2ddc17b930dd4446b259e18d2ef416c4d352fbea (diff) | |
| download | nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar.gz nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar.bz2 nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar.lz nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar.xz nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.tar.zst nixlib-dfb370ce5f3ba81ec04f5ccb4a3e3730e3c07929.zip | |
Merge pull request #14853 from avnik/fixes
skype: fix rpath broken by closure-size merge
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/skype/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 2f2dba18e49e..5bb2121b1fda 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -38,13 +38,8 @@ stdenv.mkDerivation rec { mkdir -p $out/{libexec/skype/,bin} cp -r * $out/libexec/skype/ - fullPath= - for i in $nativeBuildInputs; do - fullPath=$fullPath''${fullPath:+:}$i/lib - done - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$fullPath" $out/libexec/skype/skype + --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype cat > $out/bin/skype << EOF #!${stdenv.shell} |