diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-08 22:47:07 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-02-08 22:47:13 +0300 |
| commit | 781022de46fd821ee0683d7e81de1a16f48e9b82 (patch) | |
| tree | 749bd83f13f361faee5a5ae182ab01e7fa0f14bd | |
| parent | 34157f7a046bf0aafd9daea0fc6c46d33e53239e (diff) | |
| download | nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar.gz nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar.bz2 nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar.lz nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar.xz nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.tar.zst nixlib-781022de46fd821ee0683d7e81de1a16f48e9b82.zip | |
chromium.mkDerivation: use ninja from nativeBuildInputs
Also move Python packages there.
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ea66703f166d..2acf5627756a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -88,6 +88,11 @@ let nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ]; + nativeBuildInputs = [ + ninja which perl pkgconfig python + python2Packages.ply python2Packages.jinja2 + ]; + buildInputs = defaultDependencies ++ [ nspr nss systemd utillinux alsaLib @@ -95,7 +100,6 @@ let glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage - python2Packages.ply python2Packages.jinja2 ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux @@ -182,7 +186,7 @@ let buildPhase = let buildCommand = target: '' - "${ninja}/bin/ninja" -C "${buildPath}" \ + ninja -C "${buildPath}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' |