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

chromium.mkDerivation: use ninja from nativeBuildInputs

Browse Source 
Also move Python packages there.
This commit is contained in:
Nikolay Amiantov 2017-02-08 22:47:07 +03:00
parent 34157f7a04
commit 781022de46
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -88,6 +88,11 @@ let
nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ];
nativeBuildInputs = [
ninja which perl pkgconfig python
python2Packages.ply python2Packages.jinja2
];
buildInputs = defaultDependencies ++ [ buildInputs = defaultDependencies ++ [
nspr nss systemd nspr nss systemd
utillinux alsaLib utillinux alsaLib
@ -95,7 +100,6 @@ let
glib gtk2 dbus_glib glib gtk2 dbus_glib
libXScrnSaver libXcursor libXtst mesa libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage pciutils protobuf speechd libXdamage
python2Packages.ply python2Packages.jinja2
] ++ optional gnomeKeyringSupport libgnome_keyring3 ] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux ++ optional enableSELinux libselinux
@ -182,7 +186,7 @@ let
buildPhase = let buildPhase = let
buildCommand = target: '' buildCommand = target: ''
"${ninja}/bin/ninja" -C "${buildPath}" \ ninja -C "${buildPath}" \
-j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
"${target}" "${target}"
'' + optionalString (target == "mksnapshot" || target == "chrome") '' '' + optionalString (target == "mksnapshot" || target == "chrome") ''