tetrio-desktop: cleanup, fix GApps wrapping

gappsWrapperArgs must be added to wrapProgram in fixup phase

authored by huantian and committed by Yt cc3ea178 3a73976c

+14 -13
+14 -13
pkgs/games/tetrio-desktop/default.nix
··· 2 2 , lib 3 3 , fetchurl 4 4 , autoPatchelfHook 5 + , wrapGAppsHook 5 6 , alsa-lib 6 7 , cups 7 - , libpulseaudio 8 8 , libX11 9 9 , libXScrnSaver 10 10 , libXtst 11 11 , mesa 12 12 , nss 13 + , gtk3 14 + , libpulseaudio 13 15 , systemd 14 - , wrapGAppsHook 15 16 }: 16 17 17 18 stdenv.mkDerivation rec { ··· 37 38 libXtst 38 39 mesa 39 40 nss 41 + gtk3 40 42 ]; 41 43 42 44 dontWrapGApps = true; 43 45 44 46 libPath = lib.makeLibraryPath [ 45 - alsa-lib 46 - cups 47 47 libpulseaudio 48 - libX11 49 - libXScrnSaver 50 - libXtst 51 - mesa 52 - nss 53 48 systemd 54 49 ]; 55 50 ··· 61 56 ''; 62 57 63 58 installPhase = '' 64 - cp -R $TMP/tetrio-desktop/{usr/share,opt} $out/ 59 + runHook preInstall 65 60 66 - wrapProgram $out/opt/TETR.IO/tetrio-desktop \ 67 - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO 68 - 61 + cp -R $TMP/tetrio-desktop/{usr/share,opt} $out/ 69 62 ln -s $out/opt/TETR.IO/tetrio-desktop $out/bin/ 70 63 71 64 substituteInPlace $out/share/applications/tetrio-desktop.desktop \ 72 65 --replace "Exec=\"/opt/TETR.IO/tetrio-desktop\"" "Exec=\"$out/opt/TETR.IO/tetrio-desktop\"" 66 + 67 + runHook postInstall 68 + ''; 69 + 70 + postFixup = '' 71 + wrapProgram $out/opt/TETR.IO/tetrio-desktop \ 72 + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO \ 73 + ''${gappsWrapperArgs[@]} 73 74 ''; 74 75 75 76 meta = with lib; {