diff options
| author | cidkidnix <cidkidnix@protonmail.com> | 2022-01-08 09:12:44 -0600 |
|---|---|---|
| committer | cidkidnix <cidkidnix@protonmail.com> | 2022-01-08 09:12:44 -0600 |
| commit | 8d000d29fa951b3672057541d9944991ac7fe5d0 (patch) | |
| tree | 569754bddd610beb1eb2b064fa5dfa11e55a4f8c | |
| parent | d68980810a889b0c9858c482746aaeb764db40f8 (diff) | |
| download | PrismLauncher-8d000d29fa951b3672057541d9944991ac7fe5d0.tar.gz PrismLauncher-8d000d29fa951b3672057541d9944991ac7fe5d0.tar.bz2 PrismLauncher-8d000d29fa951b3672057541d9944991ac7fe5d0.zip | |
Fix desktop file and move directories around
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | packages/nix/overlay.nix (renamed from overlay.nix) | 0 | ||||
| -rw-r--r-- | packages/nix/polymc/0001-pick-latest-java-first.patch (renamed from nix/polymc/0001-pick-latest-java-first.patch) | 0 | ||||
| -rw-r--r-- | packages/nix/polymc/default.nix (renamed from nix/polymc/default.nix) | 11 |
4 files changed, 5 insertions, 10 deletions
@@ -2,6 +2,6 @@ description = "PolyMC"; outputs = inputs: { - overlay = import ./overlay.nix; + overlay = import ./packages/nix/overlay.nix; }; -}
\ No newline at end of file +} diff --git a/overlay.nix b/packages/nix/overlay.nix index 56e39aa7..56e39aa7 100644 --- a/overlay.nix +++ b/packages/nix/overlay.nix diff --git a/nix/polymc/0001-pick-latest-java-first.patch b/packages/nix/polymc/0001-pick-latest-java-first.patch index a65dcbfd..a65dcbfd 100644 --- a/nix/polymc/0001-pick-latest-java-first.patch +++ b/packages/nix/polymc/0001-pick-latest-java-first.patch diff --git a/nix/polymc/default.nix b/packages/nix/polymc/default.nix index f49c593a..5f1a0f27 100644 --- a/nix/polymc/default.nix +++ b/packages/nix/polymc/default.nix @@ -1,12 +1,7 @@ -{ lib, mkDerivation, makeDesktopItem, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; - desktopFile = makeDesktopItem { - name = "PolyMC"; - desktopName = "PolyMC"; - exec = "polymc"; - }; in mkDerivation rec { pname = "polymc"; @@ -34,11 +29,11 @@ mkDerivation rec { postInstall = '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 - rm $out/share/applications/* - cp ${desktopFile}/share/applications/* $out/share/applications/ wrapProgram $out/bin/polymc \ --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} + + substituteInPlace $out/share/applications/org.polymc.PolyMC.desktop --replace 'Exec=' 'Exec=${placeholder "out"}/bin/polymc' ''; meta = with lib; { |