swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-29 08:30:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
88750 commits 5 branches 0 tags 31 GiB
Commit graph

43 commits

Author SHA1 Message Date
Vladimír Čunát 7875b6ae3a gtk2: maintenance update 2.24.29 -> 2.24.30 2016-05-22 12:10:40 +02:00
Eric Sagnes 3e2318ec3e gtk2: make gtk2 look for immodule cache in $NIX_PROFILE 2016-04-16 17:51:32 +09:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát b01ae3cee0 gtk2: maintenance update 2.24.28 -> 2.24.29 2015-12-30 11:58:06 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output 
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
 2015-10-28 18:58:06 +01:00
Vladimír Čunát 5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg 
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
 2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
 2015-09-15 12:08:24 +02:00
Vladimír Čunát c4f1011cab gtk+ stack: maintenance updates 2015-05-27 22:05:42 +02:00
Vladimír Čunát d24b3aec91 gtk2: fixup splitting 
I forgot these changes were needed to make it build.
Leaving gtk3 and gnome stuff after 3.16.
 2015-04-20 20:24:47 +02:00
Vladimír Čunát bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Vladimír Čunát 2485055a96 gtk2: maintenance update 
Perhaps a bugfix important for us:
745052 Icon theme code assumes directories with mtime 0 don't exist
 2015-03-04 22:02:45 +01:00
Vladimír Čunát c01dd4ab57 gtk2: small maintenance update 2015-02-26 20:06:02 +01:00
Vladimír Čunát b9b5cb5858 gtk2: bugfix update 2014-10-19 19:31:58 +02:00
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
 2014-08-31 12:23:18 +02:00
Michael Raskin e8badf3c3b Merge pull request #3275 from taku0/gtk-env 
uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt
 2014-08-29 01:35:38 +04:00
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
taku0 a0c91d66f1 uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt 2014-07-14 21:33:05 +09:00
Vladimír Čunát e993219be7 gtk2: maintenance update 2014-06-26 18:22:49 +02:00
John Wiegley 61b94dff81 Get glib, gtk+, harfbuzz and pango working on Darwin 2014-05-12 16:53:11 -05:00
Vladimír Čunát aa48fc9b28 gtk2: bugfix update 2.24.22 -> .23 2014-03-21 10:34:19 +01:00
Vladimír Čunát 2a9bdac39a gtk2: minor update .20 -> .22 2013-11-09 16:26:53 +01:00
Mathijs Kwik 1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
 2013-09-11 10:53:31 +02:00
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
 2013-08-21 17:05:30 +02:00
Vladimír Čunát d374527509 GTK-related minor updates 2013-08-03 09:45:22 +02:00
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
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 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
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 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 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
Renamed from pkgs/development/libraries/gtk+/2.24.x.nix (Browse further)