Author: viric
Date: Mon Aug 9 07:42:43 2010
New Revision: 23051
URL: https://svn.nixos.org/websvn/nix/?rev=23051&sc=1
Log:
Making mesa build the DRI driver, required by the xorg server on the Fuloong2F
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
nixpkgs/branches/stdenv-updates/pkgs/servers/x11/xorg/overrides.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
Mon Aug 9 06:51:34 2010 (r23050)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/mesa/default.nix
Mon Aug 9 07:42:43 2010 (r23051)
@@ -14,6 +14,8 @@
configureFlags =
"--disable-gallium"
+ + (if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then
+ " --with-dri-drivers=swrast --with-driver=dri" else "")
+ (if stdenv.isDarwin then " --disable-egl" else "");
buildInputs =
Modified: nixpkgs/branches/stdenv-updates/pkgs/servers/x11/xorg/overrides.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/servers/x11/xorg/overrides.nix Mon Aug
9 06:51:34 2010 (r23050)
+++ nixpkgs/branches/stdenv-updates/pkgs/servers/x11/xorg/overrides.nix Mon Aug
9 07:42:43 2010 (r23051)
@@ -149,8 +149,6 @@
rm -fr $out/share/X11/xkb/compiled
ln -s /var/tmp $out/share/X11/xkb/compiled
'';
- configureFlagsArray = args.stdenv.lib.optionals
- (args.stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux") [
"--disable-dri" ];
};
libSM = attrs: attrs // args.stdenv.lib.optionalAttrs (args.stdenv.system ==
"i686-darwin") {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
