From 9343f6f4612301f9954ada94252701a2304c271c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 26 Jan 2015 08:47:42 +0100 Subject: [PATCH] chromium: Ensure runtime deps for enabled plugins. We're propagating the plugin flags by importing from another Nix expression file, which in turn exports the Nix path to the wrapper. This causes that the store path isn't referenced in the wrapper and the path isn't recognized by scanning the wrapper script (only those already referenced at build time are). So let's add the activated plugins to the buildInputs of the wrapper. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/applications/networking/browsers/chromium/plugins.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8e397d81919..c41b2e2c4e7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -66,7 +66,7 @@ let in stdenv.mkDerivation { name = "chromium${suffix}-${chromium.browser.version}"; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins; buildCommand = let browserBinary = "${chromium.browser}/libexec/chromium/chromium"; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 49d758c836c..e8e07f907ed 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,6 +94,7 @@ let else head (tail v); in fold (l: r: zipAttrsWith (_: f) [ l r ]) {}; in { + inherit enabledPlugins; settings = mergeAttrsets (map getNix enabledPlugins); }; };