mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Merge pull request #13094 from nathan7/chromium-flash-version-jq
chromium/plugins: use jq for extracting the Flash version
This commit is contained in:
commit
7848d215f4
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user