swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 13:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

buildMozillaMach: Cleanup obsolete version gates

Browse source
This commit is contained in:
Martin Weinelt 2022-12-03 22:39:23 +01:00
parent 3b52939d59
commit b9f0c28f6c
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -291,11 +291,9 @@ buildStdenv.mkDerivation ({
# https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS unset AS
'' + lib.optionalString (lib.versionAtLeast version "100.0") ''
# Use our own python # Use our own python
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
'' + lib.optionalString (lib.versionAtLeast version "95.0") ''
# RBox WASM Sandboxing # RBox WASM Sandboxing
export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc export WASM_CC=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}cc
export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++ export WASM_CXX=${pkgsCross.wasi32.stdenv.cc}/bin/${pkgsCross.wasi32.stdenv.cc.targetPrefix}c++
@ -357,6 +355,7 @@ buildStdenv.mkDerivation ({
"--with-system-png" # needs APNG support "--with-system-png" # needs APNG support
"--with-system-webp" "--with-system-webp"
"--with-system-zlib" "--with-system-zlib"
"--with-wasi-sysroot=${wasiSysRoot}"
# for firefox, host is buildPlatform, target is hostPlatform # for firefox, host is buildPlatform, target is hostPlatform
"--host=${buildStdenv.buildPlatform.config}" "--host=${buildStdenv.buildPlatform.config}"
"--target=${buildStdenv.hostPlatform.config}" "--target=${buildStdenv.hostPlatform.config}"
@ -370,8 +369,6 @@ buildStdenv.mkDerivation ({
# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack"
++ lib.optional (!drmSupport) "--disable-eme" ++ lib.optional (!drmSupport) "--disable-eme"
++ lib.optional (lib.versionAtLeast version "95") "--with-wasi-sysroot=${wasiSysRoot}"
++ lib.optional (lib.versionAtLeast version "100") (enableFeature sndioSupport "sndio")
++ [ ++ [
(enableFeature alsaSupport "alsa") (enableFeature alsaSupport "alsa")
(enableFeature crashreporterSupport "crashreporter") (enableFeature crashreporterSupport "crashreporter")
@ -381,6 +378,7 @@ buildStdenv.mkDerivation ({
(enableFeature jackSupport "jack") (enableFeature jackSupport "jack")
(enableFeature jemallocSupport "jemalloc") (enableFeature jemallocSupport "jemalloc")
(enableFeature pulseaudioSupport "pulseaudio") (enableFeature pulseaudioSupport "pulseaudio")
(enableFeature sndioSupport "sndio")
(enableFeature webrtcSupport "webrtc") (enableFeature webrtcSupport "webrtc")
(enableFeature debugBuild "debug") (enableFeature debugBuild "debug")
(if debugBuild then "--enable-profiling" else "--enable-optimize") (if debugBuild then "--enable-profiling" else "--enable-optimize")
@ -434,7 +432,7 @@ buildStdenv.mkDerivation ({
++ lib.optional alsaSupport alsa-lib ++ lib.optional alsaSupport alsa-lib
++ lib.optional jackSupport libjack2 ++ lib.optional jackSupport libjack2
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optional (sndioSupport && lib.versionAtLeast version "100") sndio ++ lib.optional sndioSupport sndio
++ lib.optional gssSupport libkrb5 ++ lib.optional gssSupport libkrb5
++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]
++ lib.optional jemallocSupport jemalloc ++ lib.optional jemallocSupport jemalloc