Merge pull request #13094 from nathan7/chromium-flash-version-jq

chromium/plugins: use jq for extracting the Flash version
This commit is contained in:
zimbatm 2016-02-23 22:45:42 +00:00
commit 7848d215f4

View File

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