diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-09 18:19:56 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-09 18:21:40 +0100 |
commit | 177464ade947caf561627b4f91c369a2c05dc750 (patch) | |
tree | 4e12efe19aaca082055cfdf8c725689bafc6ca19 | |
parent | 85bedcf7e97aa017270abf975c0d4dc462e4c9f7 (diff) | |
download | nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar.gz nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar.bz2 nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar.lz nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar.xz nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.tar.zst nixpkgs-177464ade947caf561627b4f91c369a2c05dc750.zip |
wrapFirefox: add enableAdobeReader
So far we only have 32-bit package. It will be silently missed on 64-bit ATM.
-rw-r--r-- | pkgs/applications/misc/adobe-reader/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 6bb16a02402..d31e9234e09 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; + meta = { description = "Adobe Reader, a viewer for PDF documents"; homepage = http://www.adobe.com/products/reader; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8c805b0bf5f..91486b608b2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -4,7 +4,7 @@ , gnash, flashplayer, hal-flash , MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra , supportsJDK, jrePlugin, icedtea_web -, trezor-bridge, bluejeans, djview4 +, trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ }: @@ -41,6 +41,7 @@ let ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans + ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader ); libs = [ gst_all.gstreamer gst_all.gst-plugins-base ] ++ lib.optionals (cfg.enableQuakeLive or false) |