1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 01:20:40 +00:00
Commit graph

33 commits

Author SHA1 Message Date
Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Luca Bruno 421ce6439c gdk-pixbuf: check for empty $out in setup-hook.sh. Closes #2818 2014-07-02 20:16:55 +02:00
Vladimír Čunát 055aeb6ef7 gdk_pixbuf: minor update 2.30.6 -> .8 2014-06-17 09:00:29 +02:00
Luca Bruno 4a3508ad1a gdk-pixbuf: check for writable $out/.., closes #2115 2014-04-22 21:10:16 +02:00
Vladimír Čunát 1dc040a8ad gdk_pixbuf: minor update 2014-03-24 22:39:42 +01:00
Luca Bruno 53fbbe3262 gnome3: Setup hook for gdk-pixbuf and gnome-icon-theme
Add necessary paths to the environment so that
applications can find icons.
2014-02-28 01:40:21 +01:00
Vladimír Čunát 74c34763e7 gdk_pixbuf: bugfix update 2.30.3 -> .4 2014-02-10 19:08:42 +01:00
Vladimír Čunát d92f6c19db gdk-pixbuf: bugfix update 2.30.2 -> .3, enable tests
Hopefully the tests will succeed on Hydra, too.
2014-02-02 10:42:53 +01:00
Vladimír Čunát 51c83e927d gdk_pixbuf: minor update (mainly JPEG fixes) 2013-12-21 15:14:55 +01:00
Vladimír Čunát 5aaabde3b8 gdk_pixbuf: bugfix update 2.30.0 -> .1 2013-11-17 14:35:29 +01:00
Vladimír Čunát 68430cf3d7 Merge branch master into x-updates
Conflicts (trivial, minor update on master, major here):
	pkgs/development/libraries/mesa/default.nix
2013-11-16 20:32:44 +01:00
Eelco Dolstra 58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
Vladimír Čunát cb8fff57c1 update gtk deps, on GNOME-3.10 branches now 2013-10-05 21:25:53 +02:00
Vladimír Čunát 7fbcc56260 add introspection into GTK libs (part of #517)
This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.
2013-08-04 21:11:24 +02:00
Vladimír Čunát d374527509 GTK-related minor updates 2013-08-03 09:45:22 +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
Jason "Don" O'Conal d884c2b639 gdk-pixbuf: add libintlOrEmpty to build inputs 2013-06-13 16:36:47 +10:00
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 03f5775f87 gdk_pixbuf: bugfix update 2013-05-02 18:33:20 +02:00
Vladimír Čunát 4e7741d694 gtk2 platform: minor updates
Also make glib use libelf (a few hudred kBs).
2013-03-29 02:01:03 +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
Vladimír Čunát 5ed188df5e gdk-pixbuf: minor update 2013-01-29 14:55:15 +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
Eelco Dolstra 277bd69fa9 * Glib/ATK/Pango/GTK+ updates.
svn path=/nixpkgs/branches/x-updates/; revision=34145
2012-05-16 21:58:57 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov 12e5f5b070 Build gdk-pixbuf-xlib
svn path=/nixpkgs/trunk/; revision=31392
2012-01-07 00:27:17 +00:00
Yury G. Kudryashov 8ba7a53129 gtk-2.x libs patchlevel upgrades
svn path=/nixpkgs/trunk/; revision=31383
2012-01-06 23:03:37 +00:00
Yury G. Kudryashov 058fc8da82 gdk-pixbuf-2.24
svn path=/nixpkgs/trunk/; revision=29378
2011-09-20 06:21:56 +00:00
Eelco Dolstra 070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib.
svn path=/nixpkgs/branches/x-updates/; revision=25961
2011-02-14 13:44:01 +00:00
Eelco Dolstra 935a8efdb0 * Remove the old gdk-pixbuf.
svn path=/nixpkgs/branches/x-updates/; revision=25854
2011-02-09 15:12:05 +00:00
Eelco Dolstra 6a59d1a98f * Latest Glib, ATK, Pango and GTK+.
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages.  This
  cuts 56 MiB off the closure of GTK+-based packages.  It wasn't
  really useful anyway because it's not installed in a way that allows
  users to find it easily on NixOS.  And if you want it, it's faster
  to Google it.

svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra 5398eceff3 * Getting rid of gtk-libs by moving the packages in gtk-libs to
development/libraries/{glib,gtk+,pango,atk,...}.  Done for glib/gtk+
  1.2.  Also deleted some obsolete, unused versions (gtkLibs 2.10,
  2.12, and 2.14).

svn path=/nixpkgs/trunk/; revision=17992
2009-10-28 15:06:18 +00:00