diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-08-19 15:06:43 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-08-19 15:08:10 +0200 |
commit | 2801a299beda0bff805e2b9bf56ade02584eb815 (patch) | |
tree | 98c05fdf8682e2bec0ea763c088b30b258a3fdd6 /pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix | |
parent | 3b2f3e59d148038632d7c2a96d78ab4442f57875 (diff) |
skypeforlinux: fix borked cherry-picking
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9f46f9227ae44..9fe03b274cff7 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -83,6 +83,8 @@ in stdenv.mkDerivation { rm -rf $out/opt $out/usr rm $out/bin/skypeforlinux + ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" + # Otherwise it looks "suspicious" chmod -R g-w $out ''; @@ -93,12 +95,6 @@ in stdenv.mkDerivation { patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true done - ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux" - - wrapProgram $out/bin/skypeforlinux \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ \ |