public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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 , pkgconfig ? null, gtk ? null
}: }:
assert xawSupport -> libXaw != null; assert xawSupport && !xaw3dSupport -> libXaw != null;
assert xawSupport && xaw3dSupport -> Xaw3d != null;
assert xpmSupport -> libXpm != null; assert xpmSupport -> libXpm != null;
assert xaw3dSupport -> Xaw3d != null;
assert gtkGUI -> pkgconfig != null && gtk != null; assert gtkGUI -> pkgconfig != null && gtk != null;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -21,9 +21,8 @@ stdenv.mkDerivation {
patches = [./crt.patch]; patches = [./crt.patch];
buildInputs = [ buildInputs = [
x11 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 xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
] ++ (if gtkGUI then [pkgconfig gtk] else []); ] ++ (if gtkGUI then [pkgconfig gtk] else []);
configureFlags = configureFlags =
if gtkGUI then ["--with-x-toolkit=gtk"] else []; 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 , 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 xpmSupport -> libXpm != null;
assert xaw3dSupport -> Xaw3d != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "emacs-21.4a"; name = "emacs-21.4a";
@ -18,8 +18,7 @@ stdenv.mkDerivation {
patches = [./crt.patch]; patches = [./crt.patch];
buildInputs = [ buildInputs = [
x11 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 xpmSupport then libXpm else null)
(if xaw3dSupport then Xaw3d else null)
]; ];
} }

4
pkgs/development/libraries/Xaw3d/builder.sh
View File

@ -15,6 +15,10 @@ buildPhase() {
installPhase() { installPhase() {
make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
cd $out/include/X11 && ln -s Xaw3d Xaw
ensureDir "$out/nix-support"
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
} }
makeFlags="CDEBUGFLAGS=" # !!! awful hack makeFlags="CDEBUGFLAGS=" # !!! awful hack

5
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, x11, xmkmf, makedepend, libXmu, libXpm, libXp, bison, flex}: {stdenv, fetchurl, x11, imake, makedepend, libXmu, libXpm, libXp, bison, flex}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "Xaw3d-1.5E"; name = "Xaw3d-1.5E";
@ -8,5 +8,6 @@ stdenv.mkDerivation {
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
}; };
patches = [./config.patch]; patches = [./config.patch];
buildInputs = [x11 xmkmf makedepend libXmu libXpm libXp bison flex]; buildInputs = [x11 imake makedepend libXmu libXpm libXp bison flex];
propagatedBuildInputs = [x11 libXmu];
} }

6
pkgs/system/all-packages-generic.nix
View File

@ -14,7 +14,7 @@ rec {
### Symbolic names. ### Symbolic names.
useOldXLibs = true; useOldXLibs = false;
# `xlibs' is the set of X library components. This used to be the # `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 # old modular X libraries project (called `xlibs') but now it's just
@ -1138,7 +1138,7 @@ rec {
inherit fetchurl stdenv x11 bison; inherit fetchurl stdenv x11 bison;
flex = flexnew; flex = flexnew;
# !!! makedepend is impure # !!! makedepend is impure
inherit (xlibs) xmkmf makedepend libXmu libXpm libXp; inherit (xlibs) imake makedepend libXmu libXpm libXp;
}; };
libdrm = import ../development/libraries/libdrm { libdrm = import ../development/libraries/libdrm {
@ -1993,7 +1993,7 @@ rec {
emacs = (import ../applications/editors/emacs) { emacs = (import ../applications/editors/emacs) {
inherit fetchurl stdenv x11 Xaw3d; inherit fetchurl stdenv x11 Xaw3d;
inherit (xlibs) libXaw libXpm; inherit (xlibs) libXaw libXpm;
xaw3dSupport = false; xaw3dSupport = true;
}; };
emacs22 = (import ../applications/editors/emacs-22) { emacs22 = (import ../applications/editors/emacs-22) {