dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #163978 from muscaln/polymc-1.1.0

Browse Source
This commit is contained in:
Sandro 2022-03-23 04:25:30 +01:00 committed by GitHub
commit b241232b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/polymc/default.nix
View File

@ -11,18 +11,20 @@
, libpulseaudio , libpulseaudio
, qtbase , qtbase
, libGL , libGL
, glfw
, openal
, msaClientID ? "" , msaClientID ? ""
}: }:
mkDerivation rec { mkDerivation rec {
pname = "polymc"; pname = "polymc";
version = "1.0.6"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "PolyMC"; owner = "PolyMC";
repo = "PolyMC"; repo = "PolyMC";
rev = version; rev = version;
sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; sha256 = "sha256-p5vbpNZI/JiQJclEo/Pu/46qVul+3DAzaoow8jabHrI=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -36,7 +38,7 @@ mkDerivation rec {
--replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")'
''; '';
cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++
lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
dontWrapQtApps = true; dontWrapQtApps = true;
@ -50,6 +52,8 @@ mkDerivation rec {
libXxf86vm libXxf86vm
libpulseaudio libpulseaudio
libGL libGL
glfw
openal
]; ];
in '' in ''
# xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
@ -68,6 +72,7 @@ mkDerivation rec {
their associated options with a simple interface. their associated options with a simple interface.
''; '';
platforms = platforms.linux; platforms = platforms.linux;
changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ cleverca22 starcraft66 ]; maintainers = with maintainers; [ cleverca22 starcraft66 ];
}; };