Vladimír Čunát
309c63c542
Merge branch 'master' into staging
2017-01-08 14:27:01 +01:00
Johannes Bornhold
5a572f8018
gtk2: Use quartz backend on darwin
2017-01-07 17:35:09 +01:00
Vladimír Čunát
5ab9e23561
gtk3: maintenance 3.22.5 -> 3.22.6
2017-01-06 21:36:21 +01:00
Daiderd Jordan
7d4e04c795
Merge pull request #21400 from johbo/darwin-xournal
...
Xournal: Darwin support
2016-12-27 20:23:18 +01:00
Johannes Bornhold
febab15b01
gtk2: Enable xinput for Darwin
2016-12-27 14:19:26 +01:00
Vladimír Čunát
c3d20b2e43
gtk3: maintenance 3.22.4 -> 3.22.5
2016-12-10 15:28:51 +01:00
Franz Pletz
a0f05feddf
gtk3: 3.22.1 -> 3.22.4
...
Fixes #19945 .
2016-12-01 01:54:30 +01:00
Jörg Thalheim
26e39566af
Merge pull request #19120 from groxxda/gtk+
...
gtk+3: 3.22.0 -> 3.22.1 [=> staging]
2016-10-03 10:36:08 +02:00
Tuomas Tynkkynen
19225bf5cc
Merge remote-tracking branch 'upstream/master' into staging
2016-10-02 10:36:47 +03:00
Tuomas Tynkkynen
5bf5de58ea
treewide: Fix 'lib.optional' misuses
...
These add a singleton list of a package to buildInputs.
2016-10-01 23:38:06 +03:00
Alexander Ried
66727f8919
gtk+3: 3.22.0 -> 3.22.1
2016-10-01 11:42:43 +02:00
Alexander Ried
7871ca4024
gtk+3: 3.20.9 -> 3.22.0
2016-09-22 22:15:57 +02:00
Vladimír Čunát
aa0fa19373
gtk2: move gtk-update-icon-cache to gtk2.out
...
... to be useful for regeneration when building nixos environments.
Fixes #18536 (hopefully).
2016-09-13 23:51:57 +02:00
Vladimír Čunát
d03a746b88
gtk2: maintenance 2.24.30 -> 2.24.31
2016-09-10 11:36:51 +02:00
Eelco Dolstra
8172cd734c
docdev -> devdoc
...
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
e646d2c07c
gnome3.gtk: fix build on darwin
...
The .la file does not exist on darwin.
2016-08-27 08:00:20 +00:00
Ram Kromberg
c60f1e9af5
gtk3: 3.20.8 -> 3.20.9
2016-08-19 21:08:25 +03:00
Vladimír Čunát
a1b0967fa0
gtk3: maintenance 3.20.6 -> 3.20.8
2016-08-06 18:47:51 +02:00
Vladimír Čunát
dcb950718a
Merge #16617 : gtk3: re-enable wayland support on Linux
2016-06-30 11:13:53 +02:00
Théophane Hufschmitt
d756aee6f6
Gtk : Enable wayland support on Linux
2016-06-30 10:06:20 +02:00
Kranium Gikos Mendoza
86e2b0e52b
gtk3: 3.20.5 -> 3.20.6
2016-06-30 09:10:44 +02:00
Vladimír Čunát
3c46131169
gtk3: maintenance update 3.20.3 -> 3.20.5
2016-05-22 12:10:41 +02:00
Vladimír Čunát
7875b6ae3a
gtk2: maintenance update 2.24.29 -> 2.24.30
2016-05-22 12:10:40 +02:00
Nikolay Amiantov
c99b050af0
Merge commit 'refs/pull/14568/head' of git://github.com/NixOS/nixpkgs into staging
2016-05-07 03:44:06 +03:00
Vladimír Čunát
802f830b2a
gtk3: maintenance update 3.20.0 -> 3.20.3
2016-04-20 16:46:01 +02:00
Damien Cassou
325cfb2192
gtk3: 3.18.5 -> 3.20.0
2016-04-20 16:46:00 +02:00
Eric Sagnes
3e2318ec3e
gtk2: make gtk2 look for immodule cache in $NIX_PROFILE
2016-04-16 17:51:32 +09:00
Eric Sagnes
77c4139262
gtk3: make gtk3 look for immodule cache in $NIX_PROFILE
2016-04-16 17:51:32 +09:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Trinkle
8605dab964
webkitgtk: add darwin support
2016-03-30 09:40:36 +02: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
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
William A. Kennington III
6e9f0df8bd
gtk: 3.18.4 -> 3.18.5
2015-11-17 21:11:53 -08:00
William A. Kennington III
cdf65ba19e
gtk3: 3.18.3 -> 3.18.4
2015-11-13 15:55:33 -08:00
William A. Kennington III
cb21b77ff1
gtk3: 3.18.0 -> 3.18.3
2015-11-10 18:25:47 -08: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
8e73a7bf53
gtk3: revise dependencies, xlibs -> xorg
2015-10-28 12:07:52 +01:00
Vladimír Čunát
148e03b2f1
gmp: split into multiple outputs
2015-10-28 10:15:49 +01:00
Vladimír Čunát
a6e4c87391
gtk3: split into multiple outputs
...
All references OK, hopefully. Seems surprisingly smooth.
2015-10-13 20:18:45 +02: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
Luca Bruno
45b1f5858c
Merge branch 'gnome' into staging
2015-09-25 10:51:50 +02:00
Luca Bruno
48ac26f512
gtk+: 3.16.6 -> 3.18.0
2015-09-25 10:48:41 +02:00
William A. Kennington III
5cfe893cc4
Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
...
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Vladimír Čunát
a5b0136b1a
gkt3: maintenance update 3.16.6 -> 3.16.7
2015-09-20 09:09:19 +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
85383d8b24
gtk3: maintenance update
2015-07-23 14:42:59 +02:00
