summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-05 14:58:52 +0200
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-07-05 14:58:52 +0200
commit524aa1c87c4cb024747930cda3a3e68c68dc362c (patch)
treee86d9faccf17e25fd0d074aad0d294fe7789b8ab /pkgs
parentb86dba54a318e910b84fb0ddbc074219c20774d1 (diff)
downloadnixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar.gz
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar.bz2
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar.lz
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar.xz
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.tar.zst
nixpkgs-524aa1c87c4cb024747930cda3a3e68c68dc362c.zip
chromium: move ed and makeWrapper into nativeBuildInputs
This most notably fixes cross _evaluation_ of chromium which previously
would fail because makeWrapper relies on runtimeShell which is not
available in the HostTarget package set.

I tested that the native chromium build still works, but haven't tried
cross compiling it yet. There very well may be additional errors, but at
least they will be build errors, not hard to understand evaluation
errors.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 14ee3290c71..535b87a87fd 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -149,9 +149,11 @@ in stdenv.mkDerivation {
     + "chromium${suffix}-${version}";
   inherit version;
 
-  buildInputs = [
+  nativeBuildInputs = [
     makeWrapper ed
+  ];
 
+  buildInputs = [
     # needed for GSETTINGS_SCHEMAS_PATH
     gsettings-desktop-schemas glib gtk3