diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-18 11:53:40 +0100 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-02-19 12:31:08 +0100 |
| commit | 26109869917c99191bef2a8c438f1e7833ad9fa2 (patch) | |
| tree | 120cb85934596a2f415676746df6373c6723d867 /pkgs/applications/networking/browsers | |
| parent | b64192744a985a5214fb249565bef0841936d4ae (diff) | |
| download | nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar.gz nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar.bz2 nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar.lz nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar.xz nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.tar.zst nixlib-26109869917c99191bef2a8c438f1e7833ad9fa2.zip | |
chromium/plugins: use jshon for extracting the Flash version from JSON
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/plugins.nix | 5 |
1 files 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" |