Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
- Loading branch information
Showing
10 changed files
with
172 additions
and
17 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,25 @@ | ||
{stdenv, fetchurl, xlibs}: | ||
{ xawSupport ? true | ||
, xpmSupport ? true | ||
, xaw3dSupport ? false | ||
, stdenv, fetchurl, x11, libXaw ? null, libXpm ? null, Xaw3d ? null | ||
}: | ||
|
||
assert xawSupport -> libXaw != null; | ||
assert xpmSupport -> libXpm != null; | ||
assert xaw3dSupport -> Xaw3d != null; | ||
|
||
stdenv.mkDerivation { | ||
name = "emacs-21.3"; | ||
name = "emacs-21.4a-Z"; | ||
builder = ./builder.sh; | ||
src = fetchurl { | ||
url = http://nix.cs.uu.nl/dist/tarballs/emacs-21.3.tar.gz; | ||
md5 = "a0bab457cbf5b4f8eb99d1d0a3ada420"; | ||
url = http://ftp.gnu.org/pub/gnu/emacs/emacs-21.4a.tar.gz; | ||
md5 = "8f9d97cbd126121bd5d97e5e31168a87"; | ||
}; | ||
patches = [./patchfile]; | ||
inherit (xlibs) libXaw libX11; | ||
|
||
buildInputs = [xlibs.libXaw xlibs.libX11]; | ||
patches = [./crt.patch]; | ||
buildInputs = [ | ||
x11 | ||
(if xawSupport then libXaw else null) | ||
(if xpmSupport then libXpm else null) | ||
(if xaw3dSupport then Xaw3d else null) | ||
]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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]; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
source $stdenv/setup | ||
dontBuild=1 | ||
dontMakeInstall=1 | ||
nop() { | ||
sourceRoot=. | ||
} | ||
unpackPhase=nop | ||
genericBuild |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
{stdenv, packages}: | ||
|
||
stdenv.mkDerivation { | ||
name = "xlibs-wrapper"; | ||
builder = ./builder.sh; | ||
propagatedBuildInputs = packages; | ||
} // { | ||
# For compatability with XFree86. | ||
buildClientLibs = true; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
source $stdenv/setup | ||
|
||
postInstall=postInstall | ||
postInstall() { | ||
ensureDir $out/lib/X11/config | ||
ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config | ||
touch $out/lib/X11/config/host.def # !!! hack | ||
touch $out/lib/X11/config/date.def # !!! hack | ||
} | ||
|
||
genericBuild |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters