JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,668 Commits 1 Branch 0 Tags 12 GiB
bd9c8128ad
Commit Graph

80 Commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
f5f56bd881 mesa(_noglu): a bugfix update 9.1.1 -> 9.1.2 2013-05-01 08:13:07 +02:00
Vladimír Čunát
eb2e46aab2 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix
 2013-04-04 21:43:40 +02:00
Carles Pagès
ceacc508dc mesa: append version of mesa_noglu to mesa buildEnv name. 2013-03-26 13:01:18 +01:00
Carles Pagès
68be54c8e2 mesa: create a buildEnv that joins mesa (without glu) and glu 
Since mesa-9.x, upstream has separated mesa and glu. @peti suggested using
buildEnv to create a mesa environment that acts like old mesa, which is what
this commit does.
 2013-03-24 12:36:33 +01:00
Vladimír Čunát
35f66fd74b mesa(_noglu): a bugfix update 2013-03-20 09:46:00 +01:00
Carles Pagès
8f77bc2024 mesa: revert to using gallium drivers. 
I had copied the config flags for mesa from the building wayland page, but
after asking in the channel it turns out there is no technical reason for not
using the gallium drivers.
 2013-03-10 23:04:24 +01:00
Carles Pagès
6c949148b6 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/mesa/default.nix
	pkgs/top-level/all-packages.nix
 2013-03-10 18:19:49 +01:00
Vladimír Čunát
c3203cfc3b mesa: another update; 9.1 released now 2013-02-23 12:07:42 +01:00
Vladimír Čunát
d53899dfca mesa: bugfix update 2013-02-22 00:05:23 +01:00
Vladimír Čunát
ed740f4c95 mesa: add some missing buildInputs (failed in new stdenv) 2013-02-21 15:38:27 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Carles Pagès
d09f2424ed mesa: add support for wayland to default version. 
Remove duplicated versions now that mesa and libdrm are updated.
 2013-02-18 20:32:47 +01:00
Carles Pagès
d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
 2013-02-18 20:15:59 +01:00
Peter Simons
86f8d4bfa2 mesa: add 'enableR600LlvmCompiler' flag to switch on r600-llvm-compiler support (defaults to off) 2013-01-28 17:39:29 +01:00
Peter Simons
ed7087a39b mesa: the build expression is not recursive 2013-01-28 17:38:42 +01:00
Arseniy Alekseyev
099ccef982 Updated Mesa to 9.0.2 
Also updated libdrm to 2.4.40 (not 2.4.41 because they have broken tars for that)

Removed the Mesa patch for sis video on mips64el-linux because sis is not
supported in Mesa anyway (since version 8)
 2013-01-28 17:32:08 +01:00
Peter Simons
ad242d38f0 Merge remote-tracking branch 'origin/master' into x-updates. 2013-01-28 17:26:32 +01:00
Carles Pagès
5cb61fd967 Update mesa to 9.0.2 and libdrm to 2.4.40. 2013-01-26 12:32:17 +01:00
Carles Pagès
7d591c23b3 Merge branch 'master' into wayland 2013-01-08 22:28:13 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs 
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
 2012-12-28 19:20:09 +01:00
Carles Pagès
5e5b676b4d Add mesa 9.0.x and corresponding libdrm. 
I took most of the changes from falsifian's repo, but I want to keep mesa 9.0
as a separate expression. For now I added wayland as a mandatory dependency,
will have to fix that.
 2012-12-02 12:07:35 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files 
Plus a small number of obsolete packages (like old versions of qemu).
 2012-11-29 13:43:37 +01:00
Eelco Dolstra
fe25e15009 mesa: Update to 8.0.5 2012-11-23 18:14:18 +01:00
Eelco Dolstra
bda3c649c4 mesa: Update to 8.0.4 2012-09-26 15:17:01 -04:00
Eelco Dolstra
5755aa2ce9 * Mesa updated to 8.0.2. 
svn path=/nixpkgs/branches/x-updates/; revision=34143
 2012-05-16 21:55:18 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'. 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
 2012-04-23 15:47:31 +00:00
Peter Simons
87f1f70070 mesa: disabled unmaintained i965 gallium driver 
svn path=/nixpkgs/trunk/; revision=31772
 2012-01-21 18:47:37 +00:00
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's 
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
 2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
6945a75f7b Adding a patch for mesa, for it to build on the loongson2f. 
svn path=/nixpkgs/trunk/; revision=31749
 2012-01-21 00:34:30 +00:00
Yury G. Kudryashov
6957240078 Fix typo 
svn path=/nixpkgs/trunk/; revision=31599
 2012-01-16 17:50:54 +00:00
Yury G. Kudryashov
ee0822153a Upgrade libdrm and mesa to the latest versions 
svn path=/nixpkgs/trunk/; revision=31598
 2012-01-16 17:48:33 +00:00
Peter Simons
729162873e Revert "mesa: updated to version 7.11.2" 
This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.

svn path=/nixpkgs/trunk/; revision=31536
 2012-01-14 12:13:51 +00:00
Peter Simons
0819c85d91 mesa: updated to version 7.11.2 
svn path=/nixpkgs/trunk/; revision=31533
 2012-01-14 12:09:09 +00:00
Peter Simons
7c10cbb6c8 We cannot use thread-local store in mesa, because the rest of our xorg 
installation has been built without support for it.

svn path=/nixpkgs/trunk/; revision=27788
 2011-07-14 20:04:34 +00:00
Peter Simons
e7a9b41e9c mesa: enable full gallium, xcb, and egl support, and build all available dri back-ends 
svn path=/nixpkgs/trunk/; revision=27786
 2011-07-14 19:21:37 +00:00
Peter Simons
18bd4e67d7 mesa: add myself as a maintainer 
svn path=/nixpkgs/trunk/; revision=27785
 2011-07-14 19:21:33 +00:00
Peter Simons
ea27b1b042 mesa: depend on python+libxml2Python rather than depending on pythonFull 
The latter package contains Tcl/Tk and whatnot else, so using that
expression as a built input was a bad idea. I'm sorry.

The dependency on talloc is gone, too. It wasn't used, apparently, but
it broke the build on Darwin because talloc doesn't compile there.

svn path=/nixpkgs/trunk/; revision=27784
 2011-07-14 19:21:29 +00:00
Peter Simons
13db8d6999 mesa: updated to version 7.10.3 
svn path=/nixpkgs/trunk/; revision=27778
 2011-07-14 12:22:59 +00:00
Peter Simons
10b7a4fe96 mesa: updated to version 7.10.2 
There changes are based on patch <http://sprunge.us/bOMG> from goibhniu.

svn path=/nixpkgs/trunk/; revision=27777
 2011-07-14 12:22:55 +00:00
Eelco Dolstra
cf6bc1aeae * Apply a patch to prevent the X server from segfaulting if kwin is 
run with swrast_dri (e.g. with the VGA driver).  (NixOS/121)

svn path=/nixpkgs/branches/x-updates/; revision=26201
 2011-03-07 21:16:34 +00:00
Eelco Dolstra
3e9de5097d * Mesa updated to 7.10.1. 
svn path=/nixpkgs/branches/x-updates/; revision=26186
 2011-03-07 11:51:08 +00:00
Eelco Dolstra
69b8bc9ed7 * Remove the removal of swrast_dri.so :-) It's better to address this 
in the NixOS X server module.

svn path=/nixpkgs/branches/x-updates/; revision=26157
 2011-03-04 12:03:53 +00:00
Eelco Dolstra
e5d12bbca7 * Disable swrast_dri.so because it doesn't work properly (NixOS/121). 
svn path=/nixpkgs/branches/x-updates/; revision=26020
 2011-02-18 09:16:11 +00:00
Eelco Dolstra
2c72c03de5 * Mesa 7.9.1. 
svn path=/nixpkgs/branches/x-updates/; revision=25905
 2011-02-11 14:48:30 +00:00
Michael Raskin
49ff7df6f1 Adding Mesa 7.9 as an option 
svn path=/nixpkgs/trunk/; revision=25513
 2011-01-12 10:03:37 +00:00
Lluís Batlle i Rossell
641f956581 Setting any stdenv.system references for the loongson2f system to 'mips64-linux'. 
(my git-svn info:)
Merge branch 'mips64' into stdenv-updates

Conflicts:
	pkgs/applications/networking/browsers/firefox/3.6.nix
	pkgs/top-level/all-packages.nix

svn path=/nixpkgs/branches/stdenv-updates/; revision=23588
 2010-09-01 09:50:12 +00:00
Lluís Batlle i Rossell
b45e219eec Making mesa build the DRI driver, required by the xorg server on the Fuloong2F 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23051
 2010-08-09 07:42:43 +00:00
Eelco Dolstra
78a5abdf85 * Updated the X.org server to 1.8.2. Note that it no longer depends 
on HAL but instead uses udev to autoconfigure input devices.  We'll
  have to update the NixOS X server module accordingly, I guess.  See
  https://fedoraproject.org/wiki/Input_device_configuration.
* Updated Mesa to 7.8.2.

svn path=/nixpkgs/branches/x-updates/; revision=22681
 2010-07-20 19:24:21 +00:00
Peter Simons
8ccc115606 pkgs/development/libraries/mesa: disable build of egl library on Darwin 
The egl library doesn't seem to work, i.e. the included demo program has
undefined symbols after linking with it.

svn path=/nixpkgs/trunk/; revision=21429
 2010-04-29 14:57:07 +00:00