From 2ddc17b930dd4446b259e18d2ef416c4d352fbea Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 20 Apr 2016 22:42:52 +0300
Subject: skype: fix rpath broken by closure-size merge

---
 pkgs/applications/networking/instant-messengers/skype/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'pkgs')

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}
-- 
cgit 1.4.1