From 3e6648699f15d1574f04f03f68a895a24749ee90 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 5 Jul 2021 14:58:52 +0200 Subject: [PATCH] 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. (cherry picked from commit 524aa1c87c4cb024747930cda3a3e68c68dc362c) --- pkgs/applications/networking/browsers/chromium/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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