JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chromium: fixup plugins with multiple outputs

Browse Source 
Chromium+flash seem to work fine now.
This commit is contained in:
Vladimír Čunát 2016-03-11 15:10:30 +01:00
parent c801cd1a04
commit 4c0125bc8f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -45,6 +45,7 @@ let
phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
outputs = [ "flash" "widevine" ]; outputs = [ "flash" "widevine" ];
out = "flash"; # outputs TODO: is this a hack?
unpackCmd = let unpackCmd = let
chan = if source.channel == "dev" then "chrome-unstable" chan = if source.channel == "dev" then "chrome-unstable"
@ -64,7 +65,7 @@ let
''; '';
patchPhase = let patchPhase = let
rpaths = [ stdenv.cc.cc ]; rpaths = [ stdenv.cc.cc.lib ];
mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
in '' in ''
for sofile in PepperFlash/libpepflashplayer.so \ for sofile in PepperFlash/libpepflashplayer.so \