chromium/plugins: use jshon for extracting the Flash version from JSON

This commit is contained in:
Nathan Zadoks
2016-02-19 12:31:08 +01:00
parent b64192744a
commit 2610986991
@@ -1,4 +1,5 @@
{ stdenv { stdenv
, jshon
, enablePepperFlash ? false , enablePepperFlash ? false
, enableWideVine ? false , enableWideVine ? false
@@ -83,9 +84,7 @@ let
wvModule = "@widevine@/lib/libwidevinecdmadapter.so"; wvModule = "@widevine@/lib/libwidevinecdmadapter.so";
wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
in '' in ''
flashVersion="$( flashVersion="$(${jshon}/bin/jshon -F PepperFlash/manifest.json -e version -u)"
sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
)"
install -vD PepperFlash/libpepflashplayer.so \ install -vD PepperFlash/libpepflashplayer.so \
"$flash/lib/libpepflashplayer.so" "$flash/lib/libpepflashplayer.so"