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

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

@@ -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

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 {
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];
}