colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #307478 from mweinelt/firefox-build

Browse Source 
buildMozillaMach: expunge old assumptions
This commit is contained in:
Martin Weinelt 2024-04-28 19:39:14 +02:00 committed by GitHub
commit 9e5cd80f1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -298,9 +298,6 @@ buildStdenv.mkDerivation {
setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags. setOutputFlags = false; # `./mach configure` doesn't understand `--*dir=` flags.
preConfigure = '' preConfigure = ''
# remove distributed configuration files
rm -f configure js/src/configure .mozconfig*
# Runs autoconf through ./mach configure in configurePhase # Runs autoconf through ./mach configure in configurePhase
configureScript="$(realpath ./mach) configure" configureScript="$(realpath ./mach) configure"
@ -308,8 +305,8 @@ buildStdenv.mkDerivation {
export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt) export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt)
# Set predictable directories for build and state # Set predictable directories for build and state
export MOZ_OBJDIR=$(pwd)/mozobj export MOZ_OBJDIR=$(pwd)/objdir
export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZBUILD_STATE_PATH=$TMPDIR/mozbuild
# Don't try to send libnotify notifications during build # Don't try to send libnotify notifications during build
export MOZ_NOSPAM=1 export MOZ_NOSPAM=1
@ -353,7 +350,7 @@ buildStdenv.mkDerivation {
# since the profiling build has not been installed to $out # since the profiling build has not been installed to $out
'' ''
OLD_LDFLAGS="$LDFLAGS" OLD_LDFLAGS="$LDFLAGS"
LDFLAGS="-Wl,-rpath,$(pwd)/mozobj/dist/${binaryName}" LDFLAGS="-Wl,-rpath,$(pwd)/objdir/dist/${binaryName}"
''} ''}
fi fi
'' + lib.optionalString googleAPISupport '' '' + lib.optionalString googleAPISupport ''
@ -510,7 +507,7 @@ buildStdenv.mkDerivation {
''; '';
preBuild = '' preBuild = ''
cd mozobj cd objdir
''; '';
postBuild = '' postBuild = ''
@ -535,9 +532,9 @@ buildStdenv.mkDerivation {
preInstall = lib.optionalString crashreporterSupport '' preInstall = lib.optionalString crashreporterSupport ''
./mach buildsymbols ./mach buildsymbols
mkdir -p $symbols/ mkdir -p $symbols/
cp mozobj/dist/*.crashreporter-symbols.zip $symbols/ cp objdir/dist/*.crashreporter-symbols.zip $symbols/
'' + '' '' + ''
cd mozobj cd objdir
''; '';
postInstall = '' postInstall = ''