aboutsummaryrefslogtreecommitdiff
path: root/nix/default.nix
diff options
context:
space:
mode:
authorhe3als <65787561+he3als@users.noreply.github.com>2022-10-22 15:30:40 +0100
committerGitHub <noreply@github.com>2022-10-22 15:30:40 +0100
commit89fd84d916b58cb7c82c94bcadc0834de8f5a039 (patch)
treefae8c646ca9b35bc2499a4c39787387686ae2a91 /nix/default.nix
parent92dfd659f1a3e11accdbf0ebbdc7cb91f74d9a21 (diff)
parent81f13052701dbec499ef65fe714f107a9b584ebf (diff)
downloadPrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.gz
PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.tar.bz2
PrismLauncher-89fd84d916b58cb7c82c94bcadc0834de8f5a039.zip
Merge branch 'PrismLauncher:develop' into develop
Diffstat (limited to 'nix/default.nix')
-rw-r--r--nix/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nix/default.nix b/nix/default.nix
index c8b4f7cc..c7fc7576 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -59,20 +59,20 @@ stdenv.mkDerivation rec {
# Copy libnbtplusplus
rm -rf source/libraries/libnbtplusplus
mkdir source/libraries/libnbtplusplus
- cp -a ${libnbtplusplus}/* source/libraries/libnbtplusplus
- chmod a+r+w source/libraries/libnbtplusplus/*
+ ln -s ${libnbtplusplus}/* source/libraries/libnbtplusplus
+ chmod -R +r+w source/libraries/libnbtplusplus
# Copy tomlplusplus
rm -rf source/libraries/tomlplusplus
mkdir source/libraries/tomlplusplus
- cp -a ${tomlplusplus}/* source/libraries/tomlplusplus
- chmod a+r+w source/libraries/tomlplusplus/*
+ ln -s ${tomlplusplus}/* source/libraries/tomlplusplus
+ chmod -R +r+w source/libraries/tomlplusplus
'';
cmakeFlags = [
"-GNinja"
"-DLauncher_QT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
] ++ lib.optionals enableLTO [ "-DENABLE_LTO=on" ]
- ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
+ ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ];
# we have to check if the system is NixOS before adding stdenv.cc.cc.lib (#923)
postInstall = ''
@@ -96,6 +96,6 @@ stdenv.mkDerivation rec {
'';
platforms = platforms.unix;
license = licenses.gpl3Only;
- maintainers = with maintainers; [ starcraft66 kloenk ];
+ maintainers = with maintainers; [ minion3665 Scrumplex ];
};
}