diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-09 19:37:11 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-09 19:37:11 +0000 |
| commit | 05f665116a583f1abba48ef3aeb794ce78565e21 (patch) | |
| tree | 749432a8ae55459b1378f64c381b33fa3da54ece /pkgs/system/all-packages-generic.nix | |
| parent | 2346c0061bc7f9d111352e40fa2b3dc2f5104ec0 (diff) | |
| download | nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar.gz nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar.bz2 nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar.lz nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar.xz nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.tar.zst nixpkgs-05f665116a583f1abba48ef3aeb794ce78565e21.zip | |
* Xaw3d: export Xaw header directory and propagate libXmu.
* Emacs: don't depend on libXaw when we're using Xaw3d. * Enable X11R7.0 over the old XLibs. Cross fingers :-) svn path=/nixpkgs/trunk/; revision=4531
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 88bec624678..b66d7ade659 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -14,7 +14,7 @@ rec { ### Symbolic names. - useOldXLibs = true; + useOldXLibs = false; # `xlibs' is the set of X library components. This used to be the # old modular X libraries project (called `xlibs') but now it's just @@ -1138,7 +1138,7 @@ rec { inherit fetchurl stdenv x11 bison; flex = flexnew; # !!! makedepend is impure - inherit (xlibs) xmkmf makedepend libXmu libXpm libXp; + inherit (xlibs) imake makedepend libXmu libXpm libXp; }; libdrm = import ../development/libraries/libdrm { @@ -1993,7 +1993,7 @@ rec { emacs = (import ../applications/editors/emacs) { inherit fetchurl stdenv x11 Xaw3d; inherit (xlibs) libXaw libXpm; - xaw3dSupport = false; + xaw3dSupport = true; }; emacs22 = (import ../applications/editors/emacs-22) { |