Commit Graph

121373 Commits

Author SHA1 Message Date
Vladimír Čunát
6345089ca0
Merge #29392: gnome3: 3.24 -> 3.26
It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.
2017-11-27 12:19:01 +01:00
Vladimír Čunát
6589519174
Merge #31453: meson: library install paths for g-ir-scanner 2017-11-27 12:13:34 +01:00
Vladimír Čunát
337e900c3d
Merge #31683: glib: Add variable for overriding schemas 2017-11-27 10:54:19 +01:00
John Ericson
c634647271 Merge branch 'ericson2314-cross-base' into staging
I forgot to sed some files in #32098.
2017-11-27 03:33:47 -05:00
John Ericson
43e00f7d18 cc-wrapper: Fix stray binPrefix -> targetPrefix
I thought my sed in e755a8a27d was
exhaustive, but it was not.
2017-11-27 03:30:15 -05:00
John Ericson
caa3599599 binutils-wrapper: Remove stray file left over from old revert
binutils-wrapper was removed in ec8d41f08c. I
hope to reintroduce it, but under a different name, so this can go.
2017-11-27 03:29:09 -05:00
John Ericson
1c44d5efc6
Merge pull request #32098 from obsidiansystems/binPrefix
treewide: Use `targetPrefix` instead of `prefix` for platform name prefixes
2017-11-27 03:20:53 -05:00
John Ericson
e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
John Ericson
bef4379b7d Merge @orivej's master history cleanup commit into staging
This is a good commit, and so I want it to be the most recent common ancester
of master and staging. Almost no files are changed; the point is history.
2017-11-27 02:42:07 -05:00
Jan Tojnar
e69a3248f7
gnome3.libgames-support: 1.2.1 → 1.2.3 2017-11-26 03:11:01 +01:00
Jan Tojnar
5fec30d77d
gnome3.pomodoro: 0.13.3 → 0.13.4
* Fixes some GNOME segfaults
2017-11-26 03:11:01 +01:00
Jan Tojnar
0ecb390981
colord: fix colord-sane path 2017-11-26 03:11:01 +01:00
Jan Tojnar
1566de20c7
nixos/gnome3: override schemas using env variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-26 03:11:00 +01:00
Jan Tojnar
4920d4fff2
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable
For some reason, the GNOME 3.26 update broke the overrides. It turns
out the overrides now need to come before the overridden schemas in the
XDG_DATA_DIRS variable. This is not possible in general due to applications
prefixing the variable (e.g. in wrapGAppsHook).

To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR
was introduced. It has greater priority than XDG_DATA_DIRS but lower
than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not
to block the built-in one for users.
2017-11-26 03:11:00 +01:00
Jan Tojnar
613a2fa13a
gnome3.gdm: 3.26.0 → 3.26.2.1 2017-11-26 03:10:59 +01:00
Jan Tojnar
7600abe61c
gnome3.caribou: clean up 2017-11-26 03:10:59 +01:00
Jan Tojnar
d6d8dfd671
colord: wrap to use GSettings 2017-11-26 03:10:59 +01:00
Jan Tojnar
fabc930ddd
colord: move the DBus configuration to /etc
NixOS generates /etc/dbus-1/system.conf including the configuration
of all the dbus derivations. Unfortunately, colord places the configuration
into $out/share instead of expected $out/etc.

This commit patches colord to use the expected path.

https://github.com/hughsie/colord/issues/61
2017-11-26 03:10:58 +01:00
Jan Tojnar
d76faaa2d7
gnome3.gnome_shell: propagate caribou
Fixes: #25968
2017-11-26 03:10:58 +01:00
Jan Tojnar
4e429b3b4e
gnome3.gitg: cleanup 2017-11-26 03:10:57 +01:00
Jan Tojnar
a6ada0c427
gnome3.libgit2_glib: move pkgconfig requires to propagatedBuildInputs 2017-11-26 03:10:57 +01:00
Jan Tojnar
6e0fc275d6
nixos/tracker-miners: init 2017-11-26 03:10:56 +01:00
Jan Tojnar
ce6cc6e229
gnomeExtensions.topicons-plus: 20 -> 21 2017-11-26 03:10:56 +01:00
Jan Tojnar
eac4e05e89
gnomeExtensions.dash-to-dock: 60 -> 61 2017-11-26 03:10:55 +01:00
Jan Tojnar
289134fddf
meson: pass library install paths to g-ir-scanner
We are patching g-ir-scanner to produce absolute paths in the GIR
files. When an application uses an internal library placed in a
non-standard path (e.g. $out/lib/gnome-shell), the scanner needs
to be informed. For autotools-based apps, the full path was
obtained from libtool-wrapped files; with Meson, this is no longer
possible – we need to pass the path information some way.

This commit channels the --fallback-library-path option added
to g-ir-scanner in aforementioned patch.
2017-11-26 03:10:55 +01:00
Jan Tojnar
4772fc10b5
gnome3.gnome_shell: reorganize source substition 2017-11-26 03:10:54 +01:00
Jan Tojnar
c9fe6567ed
gnome3.gdm: replace hardcoded paths 2017-11-26 03:10:54 +01:00
Jan Tojnar
bdf1eaaf6d
gnome3.mutter: remove stale patch 2017-11-26 03:10:54 +01:00
Jan Tojnar
494bd854f8
gnome3.libgepub: set up checkPhase 2017-11-26 03:10:53 +01:00
Jan Tojnar
5be699a3ff
gnome3.libgee: cleanup 2017-11-26 03:10:53 +01:00
Jan Tojnar
5a4320ab59
gnome3: get rid of extraneous NIX_CFLAGS_COMPILE 2017-11-26 03:10:53 +01:00
Jan Tojnar
c78f67da17
gnome3.hitori: move src to a separate file 2017-11-26 03:10:52 +01:00
Jan Tojnar
bb05d69de6
gnome3: increase version number 2017-11-26 03:10:52 +01:00
Jan Tojnar
c8b58a47fc
gvfs: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:52 +01:00
Jan Tojnar
e51c2a5d45
gnome3.gnome_shell: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:51 +01:00
Jan Tojnar
85cac43f7f
gnome3.gnome-software: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:51 +01:00
Jan Tojnar
7bd8495370
gnome3.gnome-dictionary: Rely on XML_CATALOG_FILES variable 2017-11-26 03:10:51 +01:00
Jan Tojnar
5a3b7ef2e7
gnome3: use the same version of Vala 2017-11-26 03:10:50 +01:00
Jan Tojnar
3f610ddd81
gnome3.gdm: prevent orca warning 2017-11-26 03:10:50 +01:00
Jan Tojnar
29eff705ba
gnome3.bijiben: mark as broken 2017-11-26 03:10:50 +01:00
Jan Tojnar
1c1d677149
gnome3: dependency tweaks 2017-11-26 03:10:49 +01:00
Jan Tojnar
5fae4f32fd
deepin-terminal: 2.3.3 → 2.6.1 2017-11-26 03:10:49 +01:00
Jan Tojnar
f9c9c08165
pantheon.pantheon_terminal: 0.3.1.3 → 0.4.3 2017-11-26 03:10:49 +01:00
Jan Tojnar
aa0b3b60c0
gnome3.libgepub: 0.4 → 0.5.2 2017-11-26 03:10:48 +01:00
Jan Tojnar
60dbe7eea4
granite: 0.4.0.1 → 0.4.1 2017-11-26 03:10:48 +01:00
Jan Tojnar
30886fe43c
gnome3.vte: 0.50.1 → 0.50.2 2017-11-26 03:10:48 +01:00
Jan Tojnar
b6d6a1fb79
gnome3.gpaste: 3.24.2 → 3.26.0 2017-11-26 03:10:48 +01:00
Jan Tojnar
699aa4fc86
gnome3.gjs: 1.48.6 → 1.50.2 2017-11-26 03:10:47 +01:00
Jan Tojnar
0f06bab3f3
gnome3: 3.24 -> 3.26 2017-11-26 03:10:47 +01:00
Orivej Desh
29b2984b0c
Merge pull request #31987 from jtojnar/devhelp-devdoc
stdenv: Move devhelp books to outputDevdoc
2017-11-25 23:14:47 +00:00