mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-21 13:44:50 +00:00
Code Issues Wiki Activity
38988 commits 200 branches 125 tags 9.2 GiB
Commit graph

23 commits

Author SHA1 Message Date
Kevin Quick 80adf16703 glib on darwin: disable warnings to avoid prototype errors 
vcunat did some reformatting before pushing.
 2014-01-26 10:31:05 +01:00
Vladimír Čunát e740b565cf Merge master into stdenv-updates 
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
 2013-12-29 10:01:22 +01:00
Vladimír Čunát 1876b8e4b2 glib: bugfix update 2.38.0 -> .2 2013-11-17 13:48:22 +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 74488e2b58 Merge branch 'x-updates' into stdenv-updates 
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
 2013-09-02 15:44:57 +02:00
Vladimír Čunát 7d23ab7c75 glib: bugfix update (important for ext4 sync) 2013-08-15 08:31:31 +02:00
Jason \"Don\" O'Conal d2e1023d73 gobjectIntrospection: fix build on darwin (close #832) 
vcunat edit: SANE_MALLOC_PROTOS is gone, removing the handling
https://git.gnome.org/browse/glib/commit/?id=518e3104bf6cdb5d8e6b43d3b721805db5951139
 2013-08-15 07:56:25 +02:00
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
Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. 
Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-30 11:29:30 +02:00
Jason \"Don\" O'Conal 8c54b95273 glib: fix build on darwin 
* add libintlOrEmpty to build inputs
* add -lintl to CFLAGS
 2013-07-12 16:26:44 +02:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
 2013-07-08 10:48:05 +02:00
Jason "Don" O'Conal 84f5d870f3 glib: remove unnecessary restrictions on darwin 2013-07-03 22:03:47 +10:00
Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates 
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
 2013-06-20 19:21:25 +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
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
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
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
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