3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

69 commits

Author SHA1 Message Date
Jason \"Don\" O'Conal 75dedeb8bd gtk2: fix build on darwin (close #749)
* add xlibs.libXi to build inputs
2013-07-27 20:01:08 +02:00
Shea Levy e193a4f898 Fix gtk2 build
libintlOrEmpty is [], not null, when libintl isn't needed

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 16:01:06 -04:00
Jason \"Don\" O'Conal 7573056652 gtk++: fix build on darwin
* add -lintl to CFLAGS
2013-07-12 16:26:44 +02:00
Vladimír Čunát 4255b343e8 pango, gtk3: non-Linux attempts to fix 2013-06-19 09:00:06 +02:00
Vladimír Čunát 1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Vladimír Čunát 2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Mathijs Kwik 4d19da7e99 gtk-2: remove unneeded argument 2013-06-14 13:49:35 +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 dc0c630e54 gtk2: fix compilation on darwin
* add libintlOrEmpty to build inputs
* allow cups to be disabled by setting config.gtk2.cups to false
2013-06-13 18:10:53 +10:00
Song Wenwu 92ba0a0913 gtk+: enable NLS support (merge #611)
@vcunat: add minor refactorings like file-naming style unification.
ToDo: we get 2*20MB of locale, perhaps it's worth splitting one day.
2013-06-12 10:18:38 +02:00
Vladimír Čunát 10b79927ba gtk2/3: bugfix updates 2013-05-16 17:07:06 +02: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
Song Wenwu 3b01d244c3 gtk+: enable xcursor support, fixes #469
@vcunat also reorganized the build input lists a bit
2013-04-18 16:14:44 +02:00
Vladimír Čunát 23cde66a4a gtk3: propagate dependencies from the closure 2013-04-05 10:27:11 +02:00
Vladimír Čunát 8406a62973 gtk3: core platform update (versions from GNOME 3.8) 2013-03-29 02:22:29 +01: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 811605c3a4 gtk3: major update to 3.6.4 2013-02-21 18:17:05 +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 0cddd5787f gtk2: bugfix update 2013-02-19 17:08:31 +01:00
Vladimír Čunát 55bf1376af gtk2: minor bugfix update 2013-02-10 17:17:35 +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 515f2af7d6 gtk2: minor update 2013-01-29 14:55:15 +01:00
Vladimír Čunát 56c7b96844 gtk2: a minor update 2013-01-10 22:53:46 +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 1c3ed1b8d4 gtk+: Update to 3.2.4 2012-10-08 14:20:30 -04:00
Eelco Dolstra f021420036 Revert "gtk+: Update to 3.6.0"
This reverts commit 6cbb674895.
2012-09-27 17:42:46 -04:00
Eelco Dolstra 6cbb674895 gtk+: Update to 3.6.0 2012-09-27 17:22:56 -04:00
Eelco Dolstra 2122279858 gtk+: Update to 2.24.13 2012-09-26 15:39:32 -04:00
Yury G. Kudryashov a14e9f7c0f gtk+-2.24.10
svn path=/nixpkgs/trunk/; revision=32936
2012-03-08 23:29:27 +00:00
Yury G. Kudryashov b0aa85371b Use pango-1.29
svn path=/nixpkgs/trunk/; revision=32935
2012-03-08 23:25:52 +00:00
Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov a8dba7888b Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Yury G. Kudryashov 9d67ff2a48 Remove glib-1.x and its reverse dependencies
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
2012-01-28 13:06:07 +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 8ba7a53129 gtk-2.x libs patchlevel upgrades
svn path=/nixpkgs/trunk/; revision=31383
2012-01-06 23:03:37 +00:00
Yury G. Kudryashov cee470de5a Remove gtk+-2.16
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov 32dd8c0854 gtkLibx3x update
svn path=/nixpkgs/trunk/; revision=29726
2011-10-09 08:38:34 +00:00
Yury G. Kudryashov de89582238 Add gtk-3.x libraries
Let hydra build it but do not show in nix-env -qa

svn path=/nixpkgs/trunk/; revision=29398
2011-09-20 16:18:12 +00:00
Yury G. Kudryashov 8d5fecc4f7 gtk-2.24.6 + some review
svn path=/nixpkgs/trunk/; revision=29384
2011-09-20 06:22:51 +00:00
Yury G. Kudryashov 83a44e5a65 wxGTK: rely on gtk.propagatedBuildInputs
gtkLibs224.gtk actually propagates libpng etc. through gdk_pixbuf,
so using gtk.libpng etc. makes no sense.

Remove unused 'inherit lib*;' in gtk.

svn path=/nixpkgs/trunk/; revision=29383
2011-09-20 06:22:39 +00:00
Yury G. Kudryashov 071700bcbc Remove unused files
svn path=/nixpkgs/trunk/; revision=29343
2011-09-19 10:03:14 +00:00
Eelco Dolstra 049191511c * GTK+ updated to 2.24.5.
svn path=/nixpkgs/branches/kde-4.7/; revision=27625
2011-07-07 15:43:48 +00:00
Eelco Dolstra 60510f2145 * One last glib/gtk update.
svn path=/nixpkgs/branches/x-updates/; revision=26309
2011-03-15 08:43:06 +00:00
Eelco Dolstra 927a41492d * Updated dbus, glib, gtk+.
svn path=/nixpkgs/branches/x-updates/; revision=26156
2011-03-04 11:59:04 +00:00
Eelco Dolstra 5042a81534 * Fix broken icons such as the back/forward buttons in Firefox.
svn path=/nixpkgs/branches/x-updates/; revision=25944
2011-02-13 23:38:28 +00:00
Eelco Dolstra 4b45a4c4cb * Build GTK+ with Xinput support, necessary for tablet support in Gimp
and Inkscape (suggested by Cillian de Róiste).

svn path=/nixpkgs/branches/x-updates/; revision=25919
2011-02-12 13:38:30 +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 51fe520113 * Fix the GTK+ build. It depends directly on libXrender, but probably
we didn't notice because some other X package used to have it as a
  propagated dependency.

svn path=/nixpkgs/branches/x-updates/; revision=25831
2011-02-09 12:36:08 +00:00
Eelco Dolstra b705289759 * Remove gtkLibs218 and an old Cairo.
svn path=/nixpkgs/branches/x-updates/; revision=25824
2011-02-09 10:49:20 +00:00