nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-14 09:43:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

firefox: updated common.nix to support ffx64

Browse Source 
See #51863.
This commit is contained in:
Andreas Rammhold 2018-12-11 10:37:55 +01:00 committed by Vladimír Čunát
parent 78c0253521
commit 783dc61f68
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,10 @@ stdenv.mkDerivation rec {
configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga") configureFlagsArray+=("--with-google-api-keyfile=$TMPDIR/ga")
'' + lib.optionalString (lib.versionOlder ffversion "58") '' '' + lib.optionalString (lib.versionOlder ffversion "58") ''
cd obj-* cd obj-*
''
# AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
+ lib.optionalString (lib.versionAtLeast ffversion "64") ''
unset AS
''; '';
configureFlags = [ configureFlags = [
@ -189,10 +193,10 @@ stdenv.mkDerivation rec {
"--disable-necko-wifi" # maybe we want to enable this at some point "--disable-necko-wifi" # maybe we want to enable this at some point
"--disable-updater" "--disable-updater"
"--enable-jemalloc" "--enable-jemalloc"
"--disable-maintenance-service"
"--disable-gconf" "--disable-gconf"
"--enable-default-toolkit=${default-toolkit}" "--enable-default-toolkit=${default-toolkit}"
] ]
++ lib.optional (lib.versionOlder ffversion "64") "--disable-maintenance-service"
++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks" ++ lib.optional (stdenv.isDarwin && lib.versionAtLeast ffversion "61") "--disable-xcode-checks"
++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell" ++ lib.optional (lib.versionOlder ffversion "61") "--enable-system-hunspell"
++ lib.optionals (lib.versionAtLeast ffversion "56") [ ++ lib.optionals (lib.versionAtLeast ffversion "56") [