Merge pull request #326128 from andresilva/spotify-skype-snap-yaml

NixOS · Jul 13, 2024 · 64a71b0 · 64a71b0
2 parents 0637b44 + d993f55
commit 64a71b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix
@@ -133,8 +133,6 @@ stdenv.mkDerivation {
       mkdir -p $libdir
       mv ./usr/* $out/
 
-      cp meta/snap.yaml $out
-
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
 

diff --git a/pkgs/by-name/sk/skypeforlinux/package.nix b/pkgs/by-name/sk/skypeforlinux/package.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation {
   unpackPhase = ''
     runHook preUnpack
 
-    unsquashfs "$src" /meta/{'gui/*.desktop',snap.yaml} \
+    unsquashfs "$src" '/meta/gui/*.desktop' \
         /usr/share/{doc/skypeforlinux,'icons/hicolor/*/apps/skypeforlinux.png',kservices5,pixmaps,skypeforlinux}
     sourceRoot=squashfs-root
 
@@ -139,7 +139,7 @@ stdenv.mkDerivation {
 
     mkdir -p "$out/bin"
     mv meta/gui usr/share/applications
-    mv meta/snap.yaml usr/share "$out"
+    mv usr/share "$out"
     ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin"
 
     runHook postInstall