Commit Graph

9 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 1278859d3167b9f84bfab680d9c8c463adf64a60, reversing
changes made to 0c020c98f9d4f49d5c9907db5f4b35aac7df959b.

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
2c700f3b4a librsvg: drop gtk2 dep. by default, add optional gtk3 dep.
Tried to build some affected packages, seems OK.
2013-02-21 21:33:49 +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
Vladimír Čunát
57248e25e6 librsvg: major update 2013-01-29 15:15:08 +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
Cillian de Róiste
7c9eebf446 Enable pixbuf-loader
for gtk to be able to use the pixbuf-loader for svg files it needs to be enabled, and a loaders.cache needs to be created.
2012-11-11 18:02:27 +01:00
Yury G. Kudryashov
b0dbd38ea6 Move libcroco and librsvg to top-level
svn path=/nixpkgs/trunk/; revision=32933
2012-03-08 22:57:05 +00:00
Eelco Dolstra
eca684a44b * Gnome 2.22.1.
* Moved some of the Gnome package Nix expressions into
  pkgs/desktops/gnome/default.nix - no need to have them in separate
  files.  This way the code is much shorter.  Still to be done for all
  the other Gnome packages.
* Glib 2.16.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=11855
2008-05-20 14:25:09 +00:00
Wouter den Breejen
5200276c3b nixpkgs dir: nvidia and libsrvg
svn path=/nixpkgs/trunk/; revision=8785
2007-05-28 14:10:46 +00:00