Jason \"Don\" O'Conal
85bfa943f7
glib: fix on darwin (merge #644 )
...
* include Foundation.h header
* add myself to maintainers
* build with gccApple
@vcunat: minor refactoring.
2013-06-18 08:17:36 +02:00
Eelco Dolstra
99b88cfb53
Merge remote-tracking branch 'origin/master' into multiple-outputs
...
Conflicts:
pkgs/development/libraries/acl/default.nix
pkgs/development/libraries/atk/2.6.x.nix
pkgs/development/libraries/attr/default.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/glib/2.34.x.nix
pkgs/development/libraries/gtk+/2.24.x.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/openssl/default.nix
pkgs/development/libraries/pango/1.30.x.nix
pkgs/misc/cups/default.nix
pkgs/os-specific/linux/util-linux/default.nix
pkgs/servers/x11/xorg/builder.sh
pkgs/servers/x11/xorg/default.nix
pkgs/top-level/all-packages.nix
2013-06-09 00:41:27 +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
Vladimír Čunát
fe8c1c4118
glib: minor update and patch malloc usage
...
It's mainly a work-around to make skype work again.
It also seems to stabilize xfce4-session crashes (on my setup)
https://bugzilla.xfce.org/show_bug.cgi?id=9709
2013-04-29 11:29:18 +02:00
Vladimír Čunát
15ed86c3bd
flattenInclude: a useful utility, moved into glib now
2013-04-18 20:07:38 +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
Danny Wilson
8ae2a89cab
Update glib and dbus - and make them compile on Illumos.
2013-02-28 20:04: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
efc28fb18e
glib: minor update
...
also needed for the updated cairo
2013-01-29 14:55:14 +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
Ludovic Courtès
fa7f30bf5e
glib: disable the NeXTstep on Darwin
2012-10-18 11:12:35 +02:00
Eelco Dolstra
a1300037d2
glib: Propagate pcre
...
http://hydra.nixos.org/build/3150785
2012-10-09 11:34:02 -04:00
Eelco Dolstra
4cdca52f7e
glib: Update to 2.34.0
2012-09-27 16:16:52 -04:00
Eelco Dolstra
d5758c99a3
Merge remote-tracking branch 'origin/master' into x-updates
...
Conflicts:
pkgs/misc/maven/maven-1.0.nix
pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Eelco Dolstra
3d32657782
Split glib
...
In particular, moving the bin subdirectory to a separate output
ensures that the library proper no longer depends on Python and Perl.
The closure of PulseAudio is now down from 325 MiB to 155 MiB.
2012-08-25 21:20:39 -04:00
Ludovic Courtès
11602dad82
glib: Use libiconvOrNull' instead of
libiconv'.
2012-08-21 15:53:43 +02:00
Shea Levy
e873877e42
glib: update to 2.32.4
2012-07-14 23:17:18 -04: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
Yury G. Kudryashov
e5fd55a954
glib-2.30.3
...
Build with system pcre.
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33472
2012-03-29 14:29:50 +00:00
Yury G. Kudryashov
a0474636d4
Remove some unused files
...
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33468
2012-03-29 10:34:47 +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
bafc4ff59d
* Sync with the trunk.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
2012-01-20 15:29:04 +00:00
Peter Simons
1bc803cb09
glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin
...
It appears that users of glibc expect to be able to link libintl via pkgconfig.
On Linux, this always works because that library comes with glibc, but on other
platforms gettext is required to fulfill the dependency.
I don't have access to Darwin, so I cannot actually test this change. If any
runs into problems because of this modification, please feel free to revert it!
svn path=/nixpkgs/trunk/; revision=31723
2012-01-19 21:43:17 +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
cee470de5a
Remove gtk+-2.16
...
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov
53d922475d
gtkLibs3x.glib: 2.30.2
...
svn path=/nixpkgs/trunk/; revision=31335
2012-01-06 00:55:42 +00:00
Yury G. Kudryashov
b01ac075d5
glib-2.30: add passthru.gioModuleDir
...
svn path=/nixpkgs/trunk/; revision=30295
2011-11-07 16:48:34 +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
72b58e2218
Review glib expression
...
* Use buildNativeInputs
* Use .tar.xz
* Add TODO
svn path=/nixpkgs/trunk/; revision=29381
2011-09-20 06:22:22 +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
230f2a61d0
* glib updated to 2.28.8.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27623
2011-07-07 15:43:14 +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
fd2f86820c
* Glib 2.28.2.
...
svn path=/nixpkgs/branches/x-updates/; revision=26299
2011-03-14 12:26:51 +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
Yury G. Kudryashov
38b1c5fbfc
Fix #! line in gtester-report
...
svn path=/nixpkgs/branches/x-updates/; revision=25915
2011-02-12 08:44:35 +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
52e0027c93
* Glib 2.24.2.
...
svn path=/nixpkgs/branches/x-updates/; revision=25826
2011-02-09 11:01:48 +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
Lluís Batlle i Rossell
6dc839d344
Merging from trunk. I resolved some conflicts; I hope that well.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Sander van der Burg
0cc4ca1fcd
Changed my dirty libiconv hacks I once made for i686-freebsd, into a more consistent manner by checking for a non-Linux platform in the build expressions. Hopefully, this increases portability for non-Linux platforms
...
svn path=/nixpkgs/trunk/; revision=24347
2010-10-18 11:30:44 +00:00
Lluís Batlle i Rossell
3ece765eed
glib: step towards cross-building it, set perl as native input.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=23129
2010-08-11 20:09:17 +00:00
Eelco Dolstra
b8928b09fd
* Okay, make zlib a propagated build input of glib.
...
svn path=/nixpkgs/branches/x-updates/; revision=22666
2010-07-19 11:43:45 +00:00
Eelco Dolstra
0695a9707c
* GTK+ 2.20, Glib 2.24 etc.
...
svn path=/nixpkgs/branches/x-updates/; revision=22652
2010-07-18 23:22:59 +00:00
Eelco Dolstra
26521d42e2
* gtkLibs218 updated (glib-2.22.5, gtk+-2.18.9).
...
svn path=/nixpkgs/branches/x-updates/; revision=22645
2010-07-18 21:56:12 +00:00
Sander van der Burg
d26683f5a9
Fixed compilation for GLib on FreeBSD
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19790
2010-02-03 16:12:19 +00:00
Lluís Batlle i Rossell
d47aead668
Setting the difference buildInputs/buildNativeInputs in some gtk related packages.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=19620
2010-01-22 18:49:16 +00:00
Eelco Dolstra
35257ada4e
* Updated gtk+, glib, pango.
...
svn path=/nixpkgs/trunk/; revision=19388
2010-01-13 12:11:06 +00:00
Eelco Dolstra
5682b2e9ea
* Finished getting rid of gtk-libs.
...
svn path=/nixpkgs/trunk/; revision=18010
2009-10-29 10:53:54 +00:00
Eelco Dolstra
82baac23a7
* Idem for gtk-libs/2.16.
...
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +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
Eelco Dolstra
cb1b3a0dbe
* Removed an unused glib.
...
svn path=/nixpkgs/trunk/; revision=17989
2009-10-28 13:07:44 +00:00
Marc Weber
9e83312bd1
svn path=/nixpkgs/trunk/; revision=11461
2008-04-04 16:58:19 +00:00