Skip to content

Commit 4f4a00f

Browse files
authored
Merge pull request #1953 from cleverca22/fix-submodules
nix: Fix submodules
2 parents a4d6bcc + 2bc000e commit 4f4a00f

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pcsx-redux.nix

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,16 @@ let
104104
};
105105

106106
fetchSubmodule = { owner, repo, rev, hash }@args:
107-
"cp -ru --no-preserve=all ${(fetchFromGitHub args).out} source/third_party/${repo}";
107+
"cp -ruT --no-preserve=all ${(fetchFromGitHub args).out} source/third_party/${repo}";
108108

109109
in stdenv.mkDerivation {
110110
pname = "pcsx-redux";
111111
version = "0.99test";
112112
inherit src;
113113

114114
postUnpack = ''
115-
cp -ru --no-preserve=all ${miniaudio.out} source/third_party/miniaudio
116-
cp -ru --no-preserve=all ${tracy.src} source/third_party/tracy
115+
cp -ruT --no-preserve=all ${miniaudio.out} source/third_party/miniaudio
116+
cp -ruT --no-preserve=all ${tracy.src} source/third_party/tracy
117117
'' + builtins.concatStringsSep "\n" (map fetchSubmodule submodules);
118118

119119
nativeBuildInputs = [
@@ -165,9 +165,8 @@ in stdenv.mkDerivation {
165165
# TODO: learn how to use separate debug info
166166
dontStrip = debugBuild;
167167
enableDebugging = debugBuild;
168-
168+
169169
enableParallelBuilding = true;
170-
NIX_BUILD_CORES = 4;
171170

172171
meta = {
173172
homepage = "https://pcsx-redux.consoledev.net";

0 commit comments

Comments
 (0)