diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-09 12:12:58 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-10-09 12:12:58 +0000 |
| commit | 5eef7df51dc1961c05b57531e0134d2f98885759 (patch) | |
| tree | 26a84f483da80811b70fa2b2cf888f031bb2bd2b /pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | |
| parent | 9fa8276ae5d456b2a4153c39f5f1d8abcc1081bb (diff) | |
* intltool: deleted redundant copy (it's already in the Gnome Nix
expressions).
* Fixed xkbcomp: it no longer found the keyboard definitions since it
disregards the -R option passed by the X server (it chdirs to the -R
path, but "." has been removed from the xkbcomp search path in
xkbcomp 1.0.5). Build it with /etc/X11/xkb as its default
location. This is less pure but it does allow for updating
xkeyboard-config in a running server.
* xkeyboard-config: updated to 1.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13018
Diffstat (limited to 'pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl')
| -rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 445f9909a865..b2e3fa78ff6a 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -62,6 +62,9 @@ $extraAttrs{"xf86inputevdev"} = " $extraAttrs{"libXpm"} = " patchPhase = \"sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in\";"; +$extraAttrs{"xkbcomp"} = " NIX_CFLAGS_COMPILE = \"-DDFLT_XKB_CONFIG_ROOT=\\\"/etc/X11/xkb\\\"\"; "; + + my $downloadCache = "./download-cache"; $ENV{'NIX_DOWNLOAD_CACHE'} = $downloadCache; mkdir $downloadCache, 0755; @@ -202,7 +205,7 @@ while (<>) { print "\nWRITE OUT\n"; -open OUT, ">default2.nix"; +open OUT, ">default.nix"; print OUT ""; print OUT <<EOF; |