Vladimír Čunát
98f3716650
clean some include flags that weren't really needed
...
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Vladimír Čunát
d374527509
GTK-related minor updates
2013-08-03 09:45:22 +02:00
Eelco Dolstra
552fd3d599
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/gmime/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Vladimír Čunát
4255b343e8
pango, gtk3: non-Linux attempts to fix
2013-06-19 09:00:06 +02:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d310c020c98f9
2013-05-09 14:03:35 +02:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +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
6331d32267
rename the expressions of some gtk-related libraries
...
now the default (and usually only) version is called default
2013-01-29 16:48:23 +01:00
