Commit graph

13 commits

Author SHA1 Message Date
Jan Tojnar 388faed25c
glib.setupHook: fix gsettings-schemas location
GLib setup hook expects GSettings schemas to be installed in ${!outputLib}
and tries to move them to gsettings-schemas/$name subdirectory to prevent
conflicts. But the schemas will only end up in the library output when
the build system recognizes makeFlags set by the setup hook, and in that case
the move is not necessary, since the flag already includes the subdirectory.

Normally, this is not an issue, since most packages relying on GSettings
schemas either still use Autotools with gsettings.m4, or do not have a lib
output set. But with the promulgation of multiple outputs in Nixpkgs and
more and more projects switching to Meson, the issue will become increasingly
common.

We first noticed this problem with nm-applet.

Closes https://github.com/NixOS/nixpkgs/issues/45043
2019-01-17 00:54:15 +01:00
Matthew Bauer df8ee06477 glib: only add gsettingsschemadir in make
gsettingsschemedir only works in make where you can set any variable
from the command line as in “make VAR=VAL”. Other build systems may
not support this kind of loose overriding of variables. This broke a
scons build here:

  https://hydra.nixos.org/build/84073119/
2018-11-14 14:02:56 -06:00
José Romildo Malaquias d51897e439 glib: fix pre phases
*Phases are strings, not arrays.
2018-01-06 02:33:28 +00:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Vladimír Čunát 55b7d3a181 glib: fixup output paths and use system pcre
Now pcre costs us <0.5 MB and using internal one would cost ~0.2 MB,
so if we take into account that pcre is often used, e.g. by grep...
2015-10-28 11:52:23 +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 653cdac274 glib hooks: move gsettings-schemas if on wrong place
Fixes #7325.
2015-06-14 16:23:59 +02:00
Vladimír Čunát 92725618b2 Revert "glib hooks: move gsettings-schemas if on wrong place"
This reverts commit 5df1aadd68.

It introduced some problems.
2015-06-08 13:12:18 +02:00
Vladimír Čunát 5df1aadd68 glib hooks: move gsettings-schemas if on wrong place
Fixes #7325.
2015-06-07 09:22:13 +02:00
Vladimír Čunát abbc93f783 WIP: getting better 2014-08-30 19:11:52 +02:00
Vladimír Čunát fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Vladimír Čunát 85b1ede2bf glib gschemas hook: fixup #1901
- move frome $out to $out/share
- fix quoting that prevented globbing
- indent by spaces (as it is more common in nixpkgs; 4 spaces for shell)

More work is still needed for some individual packages.
2014-04-05 13:01:51 +02:00
Vladimír Čunát 1f6a15d7de Merge #1901: add preFixupPhases to stdenv; for gsettings
Without this stdenv change it seems difficult to fix some glib's gsettings issues,
as the folders in question may (not) be created in installPhase.
2014-04-02 19:06:41 +02:00