diff options
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/plugins.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/plugins.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c3b294876c8..a0b354f0327 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -3,7 +3,7 @@ , enablePepperFlash ? false , enableWideVine ? false -, source +, upstream-info }: with stdenv.lib; @@ -40,16 +40,15 @@ let plugins = stdenv.mkDerivation { name = "chromium-binary-plugins"; - # XXX: Only temporary and has to be version-specific - src = source.plugins; + src = upstream-info.binary; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; outputs = [ "flash" "widevine" ]; unpackCmd = let - chan = if source.channel == "dev" then "chrome-unstable" - else if source.channel == "stable" then "chrome" - else "chrome-${source.channel}"; + chan = if upstream-info.channel == "dev" then "chrome-unstable" + else if upstream-info.channel == "stable" then "chrome" + else "chrome-${upstream-info.channel}"; in '' mkdir -p plugins ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ @@ -84,7 +83,9 @@ let wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' - flashVersion="$(${jshon}/bin/jshon -F PepperFlash/manifest.json -e version -u)" + flashVersion="$( + "${jshon}/bin/jshon" -F PepperFlash/manifest.json -e version -u + )" install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so" |