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

xulrunner: fix for building on i686

Browse Source
This commit is contained in:
Mathijs Kwik 2014-10-22 16:17:44 +02:00
parent 2140adf11f
commit 6af6bd9b51
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/xulrunner/default.nix
View File

@ -55,9 +55,10 @@ stdenv.mkDerivation rec {
"--disable-updater" "--disable-updater"
"--disable-pulseaudio" "--disable-pulseaudio"
] ]
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] ++ (if debugBuild
else [ "--disable-debug" "--enable-release" then [ "--enable-debug" "--enable-profiling"]
"--enable-optimize" "--enable-strip" ]); else [ "--disable-debug" "--enable-release" "--enable-strip"
"--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]);
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -4070,6 +4070,7 @@ let
tcl = callPackage ../development/interpreters/tcl { }; tcl = callPackage ../development/interpreters/tcl { };
xulrunner = callPackage ../development/interpreters/xulrunner { xulrunner = callPackage ../development/interpreters/xulrunner {
stdenv = if stdenv.isLinux then useGoldLinker stdenv else stdenv;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite; inherit (pythonPackages) pysqlite;
}; };