diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-12-19 16:09:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-19 16:09:55 +0100 |
| commit | cdf05e74c81e1916131641e4be9362e788ec3617 (patch) | |
| tree | afbe70d89da66393bac752819a9f2adea4b1ecb0 /nix/default.nix | |
| parent | df1b7f165662823795626ec82d0f3d53c668a88f (diff) | |
| parent | b98b4f10279eb99be0d663afec1dcfa65c9d9205 (diff) | |
| download | PrismLauncher-cdf05e74c81e1916131641e4be9362e788ec3617.tar.gz PrismLauncher-cdf05e74c81e1916131641e4be9362e788ec3617.tar.bz2 PrismLauncher-cdf05e74c81e1916131641e4be9362e788ec3617.zip | |
Merge pull request #647 from Scrumplex/update-flake
Diffstat (limited to 'nix/default.nix')
| -rw-r--r-- | nix/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nix/default.nix b/nix/default.nix index 6050fd37..82ba9c7d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -2,7 +2,7 @@ , stdenv , cmake , jdk8 -, jdk +, jdk17 , zlib , file , wrapQtAppsHook @@ -16,15 +16,15 @@ , glfw , openal , extra-cmake-modules +, tomlplusplus , ghc_filesystem , msaClientID ? "" -, jdks ? [ jdk jdk8 ] +, jdks ? [ jdk17 jdk8 ] # flake , self , version , libnbtplusplus -, tomlplusplus }: stdenv.mkDerivation rec { @@ -33,13 +33,14 @@ stdenv.mkDerivation rec { src = lib.cleanSource self; - nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk17 wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg zlib quazip ghc_filesystem + tomlplusplus ] ++ lib.optional (lib.versionAtLeast qtbase.version "6") qtwayland; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ] @@ -52,11 +53,6 @@ stdenv.mkDerivation rec { ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus chmod -R +r+w source/libraries/libnbtplusplus chown -R $USER: source/libraries/libnbtplusplus - rm -rf source/libraries/tomlplusplus - mkdir source/libraries/tomlplusplus - ln -s ${tomlplusplus}/* source/libraries/tomlplusplus - chmod -R +r+w source/libraries/tomlplusplus - chown -R $USER: source/libraries/tomlplusplus ''; postInstall = |