mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 12:22:37 +03:00
* Get imake to build again (xmkmf is gone).
svn path=/nixpkgs/trunk/; revision=4530
This commit is contained in:
parent
431962ce8f
commit
2346c0061b
@ -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;
|
||||
md5 = "487b4b86b2bd0c09e6d220a85d94efae";
|
||||
};
|
||||
buildInputs = [pkgconfig xproto ];
|
||||
buildInputs = [pkgconfig xproto ]; inherit xorgcffiles; x11BuildHook = ./imake.sh;
|
||||
};
|
||||
|
||||
inputproto = stdenv.mkDerivation {
|
||||
|
@ -20,6 +20,8 @@ my %pkgRequires;
|
||||
|
||||
my %pcMap;
|
||||
|
||||
my %extraAttrs;
|
||||
|
||||
|
||||
$pcMap{"freetype2"} = "freetype";
|
||||
$pcMap{"fontconfig"} = "fontconfig";
|
||||
@ -29,6 +31,9 @@ $pcMap{"libdrm"} = "libdrm";
|
||||
$pcMap{"libXaw"} = "libXaw";
|
||||
|
||||
|
||||
$extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; ";
|
||||
|
||||
|
||||
if (-e "cache") {
|
||||
open CACHE, "<cache";
|
||||
while (<CACHE>) {
|
||||
@ -147,6 +152,9 @@ foreach my $pkg (sort (keys %pkgURLs)) {
|
||||
}
|
||||
}
|
||||
|
||||
my $extraAttrs = $extraAttrs{"$pkg"};
|
||||
$extraAttrs = "" unless defined $extraAttrs;
|
||||
|
||||
print OUT <<EOF
|
||||
$pkg = stdenv.mkDerivation {
|
||||
name = "$pkgNames{$pkg}";
|
||||
@ -155,7 +163,7 @@ foreach my $pkg (sort (keys %pkgURLs)) {
|
||||
url = $pkgURLs{$pkg};
|
||||
md5 = "$pkgHashes{$pkg}";
|
||||
};
|
||||
buildInputs = [pkgconfig $inputs];
|
||||
buildInputs = [pkgconfig $inputs];$extraAttrs
|
||||
};
|
||||
|
||||
EOF
|
||||
|
@ -1,11 +1,7 @@
|
||||
source $stdenv/setup
|
||||
|
||||
postInstall=postInstall
|
||||
postInstall() {
|
||||
preInstall=preInstall
|
||||
preInstall() {
|
||||
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
|
Loading…
Reference in New Issue
Block a user