aboutsummaryrefslogtreecommitdiff
path: root/nix/default.nix
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-12-19 15:48:29 +0100
committerSefa Eyeoglu <contact@scrumplex.net>2022-12-19 15:54:09 +0100
commitfc11dfd6b4f447e79614076cbea54a7eb07d1ee6 (patch)
tree2b312043f213e834974000da3c6e5fce3d639b9f /nix/default.nix
parent483a5b6cae314cf42c3977406f3927d88c0540ad (diff)
downloadPrismLauncher-fc11dfd6b4f447e79614076cbea54a7eb07d1ee6.tar.gz
PrismLauncher-fc11dfd6b4f447e79614076cbea54a7eb07d1ee6.tar.bz2
PrismLauncher-fc11dfd6b4f447e79614076cbea54a7eb07d1ee6.zip
refactor(nix): use tomlplusplus from nixpkgs
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'nix/default.nix')
-rw-r--r--nix/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/nix/default.nix b/nix/default.nix
index b188504d..82ba9c7d 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -16,6 +16,7 @@
, glfw
, openal
, extra-cmake-modules
+, tomlplusplus
, ghc_filesystem
, msaClientID ? ""
, jdks ? [ jdk17 jdk8 ]
@@ -24,7 +25,6 @@
, self
, version
, libnbtplusplus
-, tomlplusplus
}:
stdenv.mkDerivation rec {
@@ -40,6 +40,7 @@ stdenv.mkDerivation rec {
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 =