Merge pull request #675 from muscaln/nix

Nix updates
This commit is contained in:
flow 2022-05-29 11:21:47 -03:00 committed by GitHub
commit 4f0f74d201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,6 +11,7 @@
, xorg , xorg
, libpulseaudio , libpulseaudio
, qtbase , qtbase
, quazip
, libGL , libGL
, msaClientID ? "" , msaClientID ? ""
@ -18,6 +19,7 @@
, self , self
, version , version
, libnbtplusplus , libnbtplusplus
, enableLTO ? false
}: }:
let let
@ -57,9 +59,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-GNinja" "-GNinja"
"-DENABLE_LTO=on"
"-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}" "-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; ] ++ lib.optionals enableLTO [ "-DENABLE_LTO=on" ]
++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
postInstall = '' postInstall = ''
# 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