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

* Xaw3d: export Xaw header directory and propagate libXmu.

Browse Source 
* 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
This commit is contained in:
Eelco Dolstra
2006-01-09 19:37:11 +00:00
parent 2346c0061b
commit 05f665116a
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/emacs-22/default.nix
View File

@@ -6,9 +6,9 @@
, pkgconfig ? null, gtk ? null
}:
assert xawSupport -> libXaw != null;
assert xawSupport && !xaw3dSupport -> libXaw != null;
assert xawSupport && xaw3dSupport -> Xaw3d != null;
assert xpmSupport -> libXpm != null;
assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null;
stdenv.mkDerivation {
@@ -21,9 +21,8 @@ stdenv.mkDerivation {
patches = [./crt.patch];
buildInputs = [
x11
(if xawSupport then libXaw else null)
(if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
(if xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
] ++ (if gtkGUI then [pkgconfig gtk] else []);
configureFlags =
if gtkGUI then ["--with-x-toolkit=gtk"] else [];

7
pkgs/applications/editors/emacs/default.nix
View File

@@ -4,9 +4,9 @@
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
}:
assert xawSupport -> libXaw != null;
assert xawSupport && !xaw3dSupport -> libXaw != null;
assert xawSupport && xaw3dSupport -> Xaw3d != null;
assert xpmSupport -> libXpm != null;
assert xaw3dSupport -> Xaw3d != null;
stdenv.mkDerivation {
name = "emacs-21.4a";
@@ -18,8 +18,7 @@ stdenv.mkDerivation {
patches = [./crt.patch];
buildInputs = [
x11
(if xawSupport then libXaw else null)
(if xawSupport then if xaw3dSupport then Xaw3d else libXaw else null)
(if xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
];
}