BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

spotify-unwrapped: add wrapGAppsHook

Browse source 
to fix https://github.com/NixOS/nixpkgs/issues/120070
This commit is contained in:
Artturin 2021-07-14 23:52:27 +03:00
parent cd4d1621cd
commit 74af8f2d6b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/audio/spotify/default.nix
View file

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, openssl, freetype { fetchurl, lib, stdenv, squashfsTools, xorg, alsa-lib, makeWrapper, wrapGAppsHook, openssl, freetype
, glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify
, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome
, at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon
@ -82,7 +82,7 @@ stdenv.mkDerivation {
sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149"; sha512 = "dabb55d2ba41f977b6d3f03bfcf147d11785136dd1277efc62011c8371ef25cc04531266bd16608639b9b6a500c1a18a45f44ba7a43e17ab5ac139e36eff7149";
}; };
nativeBuildInputs = [ makeWrapper squashfsTools ]; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ];
dontStrip = true; dontStrip = true;
dontPatchELF = true; dontPatchELF = true;
@ -109,6 +109,9 @@ stdenv.mkDerivation {
runHook postUnpack runHook postUnpack
''; '';
# Prevent double wrapping
dontWrapGApps = true;
installPhase = installPhase =
'' ''
runHook preInstall runHook preInstall
@ -138,6 +141,7 @@ stdenv.mkDerivation {
librarypath="${lib.makeLibraryPath deps}:$libdir" librarypath="${lib.makeLibraryPath deps}:$libdir"
wrapProgram $out/share/spotify/spotify \ wrapProgram $out/share/spotify/spotify \
''${gappsWrapperArgs[@]} \
--prefix LD_LIBRARY_PATH : "$librarypath" \ --prefix LD_LIBRARY_PATH : "$librarypath" \
--prefix PATH : "${gnome.zenity}/bin" --prefix PATH : "${gnome.zenity}/bin"