Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

even more conflicts

Browse Source 
Signed-off-by: sneedium <sneed@sneedmc.org>
This commit is contained in:
sneedium 2022-06-19 11:56:39 -04:00
parent 95e0a56df7
commit 4ccd16a1da
Signed by: sneedium
GPG Key ID: 906F66490FBE722F
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nix/default.nix
View File

@ -68,12 +68,7 @@ mkDerivation rec {
postInstall = ''
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
<<<<<<< HEAD:nix/sneedmc/default.nix
wrapProgram $out/bin/sneedmc \
"''${qtWrapperArgs[@]}" \
=======
wrapQtApp $out/bin/polymc \
>>>>>>> upstream/develop:nix/default.nix
wrapQtApp $out/bin/sneedmc \
--set GAME_LIBRARY_PATH ${gameLibraryPath} \
--prefix POLYMC_JAVA_PATHS : ${javaPaths} \
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}

7
nix/sneedmc/default.nix
View File

@ -68,12 +68,7 @@ mkDerivation rec {
postInstall = ''
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
<<<<<<< HEAD:nix/sneedmc/default.nix
wrapProgram $out/bin/sneedmc \
"''${qtWrapperArgs[@]}" \
=======
wrapQtApp $out/bin/polymc \
>>>>>>> upstream/develop:nix/default.nix
wrapQtApp $out/bin/sneedmc \
--set GAME_LIBRARY_PATH ${gameLibraryPath} \
--prefix POLYMC_JAVA_PATHS : ${javaPaths} \
--prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]}