diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-11 15:10:30 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-11 15:10:51 +0100 |
| commit | 4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46 (patch) | |
| tree | 18f6ab74e8f11d170ad502283584de3c6cdab51e /pkgs/applications | |
| parent | c801cd1a047efa51055fd04698e316ddd503fd1b (diff) | |
| download | nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar.gz nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar.bz2 nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar.lz nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar.xz nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.tar.zst nixlib-4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46.zip | |
chromium: fixup plugins with multiple outputs
Chromium+flash seem to work fine now.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/plugins.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index c3b294876c87..ebdb3d844187 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,6 +45,7 @@ let phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; outputs = [ "flash" "widevine" ]; + out = "flash"; # outputs TODO: is this a hack? unpackCmd = let chan = if source.channel == "dev" then "chrome-unstable" @@ -64,7 +65,7 @@ let ''; patchPhase = let - rpaths = [ stdenv.cc.cc ]; + rpaths = [ stdenv.cc.cc.lib ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ |