public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Get imake to build again (xmkmf is gone). 

svn path=/nixpkgs/trunk/; revision=4530
This commit is contained in:
Eelco Dolstra 2006-01-09 19:34:26 +00:00
parent 431962ce8f
commit 2346c0061b
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/servers/x11/xorg/default.nix
View File

@ -602,7 +602,7 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/imake-X11R7.0-1.0.1.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.0/src/everything/imake-X11R7.0-1.0.1.tar.bz2;
md5 = "487b4b86b2bd0c09e6d220a85d94efae"; md5 = "487b4b86b2bd0c09e6d220a85d94efae";
}; };
buildInputs = [pkgconfig xproto ]; buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh;
}; };
inputproto = stdenv.mkDerivation { inputproto = stdenv.mkDerivation {

10
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -20,6 +20,8 @@ my %pkgRequires;
my %pcMap; my %pcMap;
my %extraAttrs;
$pcMap{"freetype2"} = "freetype"; $pcMap{"freetype2"} = "freetype";
$pcMap{"fontconfig"} = "fontconfig"; $pcMap{"fontconfig"} = "fontconfig";
@ -29,6 +31,9 @@ $pcMap{"libdrm"} = "libdrm";
$pcMap{"libXaw"} = "libXaw"; $pcMap{"libXaw"} = "libXaw";
$extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; ";
if (-e "cache") { if (-e "cache") {
open CACHE, "<cache"; open CACHE, "<cache";
while (<CACHE>) { while (<CACHE>) {
@ -147,6 +152,9 @@ foreach my $pkg (sort (keys %pkgURLs)) {
} }
} }
my $extraAttrs = $extraAttrs{"$pkg"};
$extraAttrs = "" unless defined $extraAttrs;
print OUT <<EOF print OUT <<EOF
$pkg = stdenv.mkDerivation { $pkg = stdenv.mkDerivation {
name = "$pkgNames{$pkg}"; name = "$pkgNames{$pkg}";
@ -155,7 +163,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
url = $pkgURLs{$pkg}; url = $pkgURLs{$pkg};
md5 = "$pkgHashes{$pkg}"; md5 = "$pkgHashes{$pkg}";
}; };
buildInputs = [pkgconfig $inputs]; buildInputs = [pkgconfig $inputs];$extraAttrs
}; };
EOF EOF

8
pkgs/servers/x11/xorg/xmkmf.sh → pkgs/servers/x11/xorg/imake.sh
View File

@ -1,11 +1,7 @@
source $stdenv/setup preInstall=preInstall
preInstall() {
postInstall=postInstall
postInstall() {
ensureDir $out/lib/X11/config ensureDir $out/lib/X11/config
ln -s $xorgcffiles/lib/X11/config/* $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/host.def # !!! hack
touch $out/lib/X11/config/date.def # !!! hack touch $out/lib/X11/config/date.def # !!! hack
} }
genericBuild