From 26109869917c99191bef2a8c438f1e7833ad9fa2 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Thu, 18 Feb 2016 11:53:40 +0100 Subject: [PATCH] chromium/plugins: use jshon for extracting the Flash version from JSON --- pkgs/applications/networking/browsers/chromium/plugins.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 157ddf379c23..c3b294876c87 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,4 +1,5 @@ { stdenv +, jshon , enablePepperFlash ? false , enableWideVine ? false @@ -83,9 +84,7 @@ let wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; in '' - flashVersion="$( - sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json - )" + flashVersion="$(${jshon}/bin/jshon -F PepperFlash/manifest.json -e version -u)" install -vD PepperFlash/libpepflashplayer.so \ "$flash/lib/libpepflashplayer.so"