ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-23 21:57:52 +03:00
Code Issues Projects Releases Wiki Activity

chromium: Ensure runtime deps for enabled plugins.

Browse Source 
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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-01-26 08:47:42 +01:00
parent eae32fb798
commit 9343f6f461
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -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";

1
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -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);
};
};