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/development/libraries/Xaw3d | |
| parent | 2346c0061bc7f9d111352e40fa2b3dc2f5104ec0 (diff) | |
* 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/development/libraries/Xaw3d')
| -rw-r--r-- | pkgs/development/libraries/Xaw3d/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/Xaw3d/default.nix | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index d64102b4f664..bbe01704175c 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -15,6 +15,10 @@ buildPhase() { installPhase() { 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 diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index dd5e5ccc5c3d..8b3a405f3e1a 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -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 { name = "Xaw3d-1.5E"; @@ -8,5 +8,6 @@ stdenv.mkDerivation { md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; }; patches = [./config.patch]; - buildInputs = [x11 xmkmf makedepend libXmu libXpm libXp bison flex]; + buildInputs = [x11 imake makedepend libXmu libXpm libXp bison flex]; + propagatedBuildInputs = [x11 libXmu]; } |