diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-04-28 16:13:25 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2024-04-28 16:13:25 +0200 |
| commit | 3faef425650568520e7df6751a2fddc349227f18 (patch) | |
| tree | 17ff06f0440916f25e84f4ee494b09f4b7b53e19 /pkgs/applications/networking/browsers | |
| parent | 3b61d595b17f2e3410bcc79c473060e098829eb8 (diff) | |
buildMozillaMach: stop polluting the hg tree
Moves the MOZ_OBJDIR into a path that is ignored through .hgignore, and the MOZBUILD_STATE_PATH outside of the source root. Closes: #306937
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 5166fdf85153a..745cd9ee55184 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -308,8 +308,8 @@ buildStdenv.mkDerivation { export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt) # Set predictable directories for build and state - export MOZ_OBJDIR=$(pwd)/mozobj - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild + export MOZ_OBJDIR=$(pwd)/objdir + export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild # Don't try to send libnotify notifications during build export MOZ_NOSPAM=1 @@ -353,7 +353,7 @@ buildStdenv.mkDerivation { # since the profiling build has not been installed to $out '' OLD_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}" + LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}" ''} fi '' + lib.optionalString googleAPISupport '' @@ -510,7 +510,7 @@ buildStdenv.mkDerivation { ''; preBuild = '' - cd mozobj + cd objdir ''; postBuild = '' @@ -535,9 +535,9 @@ buildStdenv.mkDerivation { preInstall = lib.optionalString crashreporterSupport '' ./mach buildsymbols mkdir -p $symbols/ - cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ + cp objdir/dist/*.crashreporter-symbols.zip $symbols/ '' + '' - cd mozobj + cd objdir ''; postInstall = '' |