diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-03 22:39:23 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-12-04 13:04:34 +0100 |
| commit | b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d (patch) | |
| tree | 546773b1bc5a59db002714a41ad1dd7381d90e74 /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 3b52939d5954d5e1ccbb556f4168ff7f6b7bfb0a (diff) | |
| download | nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar.gz nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar.bz2 nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar.lz nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar.xz nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.tar.zst nixpkgs-b9f0c28f6c0e0e0ddf012c447ab6e66c368b014d.zip | |
buildMozillaMach: Cleanup obsolete version gates
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 711c4b2d70a..49cd312592f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -291,11 +291,9 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1497286 unset AS - '' + lib.optionalString (lib.versionAtLeast version "100.0") '' # Use our own python export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system - '' + lib.optionalString (lib.versionAtLeast version "95.0") '' # RBox WASM Sandboxing 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++ @@ -357,6 +355,7 @@ buildStdenv.mkDerivation ({ "--with-system-png" # needs APNG support "--with-system-webp" "--with-system-zlib" + "--with-wasi-sysroot=${wasiSysRoot}" # for firefox, host is buildPlatform, target is hostPlatform "--host=${buildStdenv.buildPlatform.config}" "--target=${buildStdenv.hostPlatform.config}" @@ -370,8 +369,6 @@ buildStdenv.mkDerivation ({ # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ 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 crashreporterSupport "crashreporter") @@ -381,6 +378,7 @@ buildStdenv.mkDerivation ({ (enableFeature jackSupport "jack") (enableFeature jemallocSupport "jemalloc") (enableFeature pulseaudioSupport "pulseaudio") + (enableFeature sndioSupport "sndio") (enableFeature webrtcSupport "webrtc") (enableFeature debugBuild "debug") (if debugBuild then "--enable-profiling" else "--enable-optimize") @@ -434,7 +432,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ 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.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional jemallocSupport jemalloc |