diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-11-12 17:05:51 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-11-12 17:05:51 +0000 |
commit | ea95a0509ecde0208d26cea272bd8fc5136dd4be (patch) | |
tree | 4a9cbcf689813a01ad579b1b76dc974840b8dfd5 /pkgs/development/libraries/Xaw3d | |
parent | abcd9e81557d8ffc7228a110ba2bb3058b618c44 (diff) | |
download | nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar.gz nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar.bz2 nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar.lz nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar.xz nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.tar.zst nixlib-ea95a0509ecde0208d26cea272bd8fc5136dd4be.zip |
* Start the switch to the new X libraries. It's still conditional:
set `useOldXLibs' to `false' in all-packages-generic.nix to use them. * Added Xaw3d. * Added Xaw3d support to Emacs. svn path=/nixpkgs/trunk/; revision=4263
Diffstat (limited to 'pkgs/development/libraries/Xaw3d')
-rw-r--r-- | pkgs/development/libraries/Xaw3d/builder.sh | 22 | ||||
-rw-r--r-- | pkgs/development/libraries/Xaw3d/config.patch | 51 | ||||
-rw-r--r-- | pkgs/development/libraries/Xaw3d/default.nix | 12 |
3 files changed, 85 insertions, 0 deletions
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh new file mode 100644 index 000000000000..d64102b4f664 --- /dev/null +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -0,0 +1,22 @@ +source $stdenv/setup + +configurePhase=configurePhase +configurePhase() { + cd lib/Xaw3d + (mkdir X11 && cd X11 && ln -fs .. Xaw3d) + xmkmf +} + +buildPhase=buildPhase +buildPhase() { + make depend $makeFlags + make $makeFlags +} + +installPhase() { + make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include +} + +makeFlags="CDEBUGFLAGS=" # !!! awful hack + +genericBuild \ No newline at end of file diff --git a/pkgs/development/libraries/Xaw3d/config.patch b/pkgs/development/libraries/Xaw3d/config.patch new file mode 100644 index 000000000000..4062f313368f --- /dev/null +++ b/pkgs/development/libraries/Xaw3d/config.patch @@ -0,0 +1,51 @@ +diff -rc xc-orig/lib/Xaw3d/Imakefile xc/lib/Xaw3d/Imakefile +*** xc-orig/lib/Xaw3d/Imakefile 2003-03-08 15:55:18.000000000 +0100 +--- xc/lib/Xaw3d/Imakefile 2005-11-11 20:12:24.000000000 +0100 +*************** +*** 9,15 **** + XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES: + #define GRAY_BLKWHT_STIPPLES + XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS: +! #undef ARROW_SCROLLBARS + + #define DoNormalLib NormalLibXaw + #define DoSharedLib SharedLibXaw +--- 9,15 ---- + XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES: + #define GRAY_BLKWHT_STIPPLES + XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS: +! #define ARROW_SCROLLBARS + + #define DoNormalLib NormalLibXaw + #define DoSharedLib SharedLibXaw +*************** +*** 22,28 **** + #define IncSubSubdir Xaw3d + + XCOMM When building outside an X11 source tree: +! XCOMM EXTRA_INCLUDES = -I. + + #ifdef SharedXawReqs + REQUIREDLIBS = SharedXawReqs +--- 22,28 ---- + #define IncSubSubdir Xaw3d + + XCOMM When building outside an X11 source tree: +! EXTRA_INCLUDES = -I. + + #ifdef SharedXawReqs + REQUIREDLIBS = SharedXawReqs +diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l +*** xc-orig/lib/Xaw3d/laylex.l 1996-10-15 16:41:26.000000000 +0200 +--- xc/lib/Xaw3d/laylex.l 2005-11-11 20:03:50.000000000 +0100 +*************** +*** 26,31 **** +--- 26,33 ---- + #ifdef __STDC__ + static int count (); + #endif ++ ++ static int LayYY_prev_more_offset = 0; + %} + %% + vertical return VERTICAL; diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix new file mode 100644 index 000000000000..dd5e5ccc5c3d --- /dev/null +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, x11, xmkmf, makedepend, libXmu, libXpm, libXp, bison, flex}: + +stdenv.mkDerivation { + name = "Xaw3d-1.5E"; + builder = ./builder.sh; + src = fetchurl { + url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz; + md5 = "29ecfdcd6bcf47f62ecfd672d31269a1"; + }; + patches = [./config.patch]; + buildInputs = [x11 xmkmf makedepend libXmu libXpm libXp bison flex]; +} |