diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-11-01 11:34:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-11-01 11:34:47 +0000 |
| commit | e542ee6e4f68956727c8a1168cde5afc2bf7200c (patch) | |
| tree | 03ffd2727e6e4a1317b7f3de50b2859afcc40ff8 /pkgs | |
| parent | 4ba92bbd4e65ef61a6df45d85a8924414c3fea2b (diff) | |
| download | nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar.gz nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar.bz2 nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar.lz nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar.xz nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.tar.zst nixpkgs-e542ee6e4f68956727c8a1168cde5afc2bf7200c.zip | |
* Build Acrobat Reader with Xinerama support. May or may not be useful.
svn path=/nixpkgs/trunk/; revision=4181
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/acrobat-reader/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 8 |
2 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/applications/misc/acrobat-reader/default.nix b/pkgs/applications/misc/acrobat-reader/default.nix index f1e12fc02cf..c23a9f71352 100644 --- a/pkgs/applications/misc/acrobat-reader/default.nix +++ b/pkgs/applications/misc/acrobat-reader/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, libXt, libXp, libXext, libX11, glib, pango, atk, gtk, libstdcpp5, zlib}: +{ xineramaSupport ? false +, stdenv, fetchurl, libXt, libXp, libXext, libX11, libXinerama ? null +, glib, pango, atk, gtk, libstdcpp5, zlib +}: stdenv.mkDerivation { name = "acrobat-reader-7.0.1"; @@ -7,5 +10,8 @@ stdenv.mkDerivation { url = http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0/enu/AdbeRdr701_linux_enu.tar.gz; md5 = "79e5a40aca6b49f7015cb1694876f87a"; }; - libPath = [libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib]; + libPath = [ + libXt libXp libXext libX11 glib pango atk gtk libstdcpp5 zlib + (if xineramaSupport then libXinerama else null) + ]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 8fe78c2c20d..40ce7a9febe 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1401,6 +1401,11 @@ rec { inherit fetchurl stdenv; }; + fuse = import ../os-specific/linux/fuse { + inherit fetchurl stdenv; + }; + + ### DATA docbook_xml_dtd_42 = (import ../data/sgml+xml/schemas/xml-dtd/docbook-4.2) { @@ -1677,9 +1682,10 @@ rec { acroread = (import ../applications/misc/acrobat-reader) { inherit fetchurl stdenv zlib; - inherit (xlibs) libXt libXp libXext libX11; + inherit (xlibs) libXt libXp libXext libX11 libXinerama; inherit (gtkLibs) glib pango atk gtk; libstdcpp5 = gcc33.gcc; + xineramaSupport = true; }; eclipse = (import ../applications/editors/eclipse) { |