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