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

xorg: deault.nix and generate-expr-from-tarballs.pl synced

Browse Source 
svn path=/nixpkgs/trunk/; revision=10318
This commit is contained in:
Yury G. Kudryashov 2008-01-28 19:31:59 +00:00
parent 2dcb0fa635
commit fb31183364
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1283,7 +1283,7 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/setxkbmap-1.0.4.tar.bz2;
sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv"; sha256 = "1b1brw1v98q2rqhr5x7f8mr3clxq62nw5175gpamg5s172916nwv";
}; };
buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share/X11; ln -sfn ${xkeyboard_config}/etc/X11/xkb $out/share/X11/"; buildInputs = [pkgconfig libX11 libxkbfile ]; postInstall = "ensureDir $out/share; ln -sfn ${xkeyboard_config}/etc/X11 $out/share/X11";
}) // {inherit libX11 libxkbfile ;}; }) // {inherit libX11 libxkbfile ;};
showfont = (stdenv.mkDerivation { showfont = (stdenv.mkDerivation {
@ -2216,8 +2216,8 @@ rec {
url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2; url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.3/src/everything/xf86-video-sis-0.9.3.tar.bz2;
sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9"; sha256 = "1xin2hcjjwj2810h7kxhkmqq841plbsvk0swmjl9py7z2vxyi3l9";
}; };
buildInputs = [pkgconfig fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ]; buildInputs = [pkgconfig fontsproto glproto mesaHeaders libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ];
}) // {inherit fontsproto libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;}; }) // {inherit fontsproto glproto mesaHeaders libdrm randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xf86miscproto xineramaproto xorgserver xproto ;};
xf86videosisusb = (stdenv.mkDerivation { xf86videosisusb = (stdenv.mkDerivation {
name = "xf86-video-sisusb-0.8.1"; name = "xf86-video-sisusb-0.8.1";

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

@ -41,16 +41,21 @@ $pcMap{"\$PIXMAN"} = "pixman";
$pcMap{"\$RENDERPROTO"} = "renderproto"; $pcMap{"\$RENDERPROTO"} = "renderproto";
$extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch]; "; $extraAttrs{"xorgserver"} = " mesaSrc = mesa.src; x11BuildHook = ./xorgserver.sh; patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch ./xorgserver-xkb-leds.patch ]; ";
$extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; "; $extraAttrs{"imake"} = " inherit xorgcffiles; x11BuildHook = ./imake.sh; patches = [./imake.patch]; ";
$extraAttrs{"setxkbmap"} = " postInstall = \"ensureDir \$out/share/X11; ln -sfn \${xkeyboard_config}/etc/X11/xkb \$out/share/X11/\"; "; $extraAttrs{"setxkbmap"} = " postInstall = \"ensureDir \$out/share; ln -sfn \${xkeyboard_config}/etc/X11 \$out/share/X11\";";
$extraAttrs{"fontmiscmisc"} = " postInstall = \"ln -s \${fontalias}/lib/X11/fonts/misc/fonts.alias \$out/lib/X11/fonts/misc/fonts.alias\"; "; $extraAttrs{"fontmiscmisc"} = " postInstall = \"ln -s \${fontalias}/lib/X11/fonts/misc/fonts.alias \$out/lib/X11/fonts/misc/fonts.alias\"; ";
$extraAttrs{"mkfontdir"} = " preBuild = \"substituteInPlace mkfontdir.cpp --replace BINDIR \${mkfontscale}/bin\"; "; $extraAttrs{"mkfontdir"} = " preBuild = \"substituteInPlace mkfontdir.cpp --replace BINDIR \${mkfontscale}/bin\"; ";
$extraAttrs{"xf86inputevdev"} = "
preBuild = \"
sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c
\";";
my $downloadCache = "./download-cache"; my $downloadCache = "./download-cache";
$ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache;
@ -174,6 +179,7 @@ while (<>) {
process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g;
push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/; push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videoi810/;
push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videosis/;
push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videointel/; push @requires, "glproto", "mesaHeaders" if $pkg =~ /xf86videointel/;
push @requires, "zlib" if $pkg =~ /xorgserver/; push @requires, "zlib" if $pkg =~ /xorgserver/;
push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/; push @requires, "xf86bigfontproto" if $pkg =~ /xorgserver/;