diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-05-05 12:38:04 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-05-05 12:38:04 +0000 |
| commit | 4fb36441e20c876efd5a4d3287cca742dc16fa97 (patch) | |
| tree | 1fc31679651bba8409776aa2e0e1f11af3b58495 /pkgs | |
| parent | 72b1cefae9ccbee4f721eab0baff2e10b8687cf8 (diff) | |
| download | nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar.gz nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar.bz2 nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar.lz nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar.xz nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.tar.zst nixlib-4fb36441e20c876efd5a4d3287cca742dc16fa97.zip | |
Override xf86videoati version and make xkbcomp work from inside X server
svn path=/nixpkgs/trunk/; revision=15450
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 82494e42d2bb..4cfa6260063e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -45,8 +45,16 @@ buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; }; + xf86videoati = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [xorg.glproto args.mesa]; + src = args.fetchurl { + url = ftp://ftp.x.org/pub/individual/driver/xf86-video-ati-6.12.2.tar.bz2; + sha256 = "0l17mv7ljw9cnvfblms62vnjkpd26gf5dqgdpfzvkxqrfyhvpvhv"; + }; + }; + xkbcomp = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\"/etc/X11/xkb\""; + NIX_CFLAGS_COMPILE = "-DDFLT_XKB_CONFIG_ROOT=\".\""; }; xorgserver = attrs: attrs // { |