diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-09 19:34:26 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-09 19:34:26 +0000 |
| commit | 2346c0061bc7f9d111352e40fa2b3dc2f5104ec0 (patch) | |
| tree | 33324b7d2a43530d6fc981cb1757c3715c460f33 /pkgs | |
| parent | 431962ce8f6976a8a77f73e46c18ef3135b53800 (diff) | |
| download | nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar.gz nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar.bz2 nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar.lz nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar.xz nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.tar.zst nixpkgs-2346c0061bc7f9d111352e40fa2b3dc2f5104ec0.zip | |
* Get imake to build again (xmkmf is gone).
svn path=/nixpkgs/trunk/; revision=4530
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 2 | ||||
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 10 | ||||
| -rw-r--r-- | pkgs/servers/x11/xorg/imake.sh (renamed from pkgs/servers/x11/xorg/xmkmf.sh) | 8 |
3 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b8e0e8cb61b..c4024964259 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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 { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 658d2a81342..1fb8ed2cd14 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -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 diff --git a/pkgs/servers/x11/xorg/xmkmf.sh b/pkgs/servers/x11/xorg/imake.sh index 1891f61dabe..340798a5364 100644 --- a/pkgs/servers/x11/xorg/xmkmf.sh +++ b/pkgs/servers/x11/xorg/imake.sh @@ -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 |