diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/applications/networking/instant-messengers/skype/default.nix | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
| download | nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.gz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.bz2 nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.lz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.xz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.zst nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.zip | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/skype/default.nix')
| -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 2f2dba18e49..5bb2121b1fd 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} |