3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

182 commits

Author SHA1 Message Date
Vladimír Čunát 3fe32b675e
Merge branch 'master' into staging 2019-01-22 15:59:42 +01:00
Will Dietz 04f1e0098c glib: more "trash mount points" fixes from upstream 2019-01-20 01:21:17 -06:00
Jan Tojnar 31ff786277
Merge pull request #54130 from jtojnar/glib-gsettings-prefix
glib.setupHook: fix gsettings-schemas location
2019-01-17 11:03:56 +01:00
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
Jan Tojnar 2122baf8f6
glib: depend on Darwin libraries
To support GNextstepSettingsBackend and Cocoa notifications, certain libraries
need to be added on Darwin.
2019-01-16 13:21:40 +01:00
Tor Hedin Brønner 462a6d3250 glib: fix libgio segfaults
In particular this fixes the libmediaart tests.

closes https://github.com/NixOS/nixpkgs/issues/53701
2019-01-09 23:05:48 +01:00
Will Dietz d030db0fc0
glib: 2.58.1 -> 2.58.2 2018-12-26 03:24:57 +01:00
Jörg Thalheim efa57f8820
glib: fix cross -> inherit devdoc from native build
Glib uses gobject introspection to generate documentation.
If we would want to cross-compile those, we would need native binaries
from the previous build stage. Instead we can simply just copy over
the generated documentation.
2018-12-10 11:36:02 +00:00
Tor Hedin Brønner 38c529f57a
glib: use absolute path for gio-launch-desktop
glib tries to look up `gio-launch-desktop` in the path which obviously can fail.
Specifically this now happens when launching gnome-shell.
2018-11-30 21:35:15 +01:00
Jan Tojnar 0149459f42
glib: 2.56.0 → 2.58.1 2018-11-30 21:33:58 +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
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Vladimír Čunát 3f80b81ece
Merge branch 'staging' into #38486 2018-08-30 18:30:32 +02:00
Jan Malakhovski 456d3e3192 glib: use tested version when doCheckByDefault is set
This changes the way how the `glib` dependecy cycles are broken to make
the tested `glib` the default.

`glib-tested` is no longer needed as packages now use the checked version when
`doCheckByDefault` is set, since it was not used anywhere, I removed it.
2018-07-23 23:04:05 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Bauer 76999cc40e treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases =
true;}'’ work in Nixpkgs.

Misc...

- qtikz: use libsForQt5.callPackage

  This ensures we get the right poppler.

- rewrites:

  docbook5_xsl -> docbook_xsl_ns
  docbook_xml_xslt -> docbook_xsl

diffpdf: fixup
2018-07-18 23:25:20 -04:00
Will Dietz 3a6b91fa90 glib: also add gobject init patch to fix w/musl 2018-06-25 11:20:04 -05:00
Will Dietz 7fa6b34093 glib: patch to fix w/musl, quark static ctor order assumptions
From [1] with prefix added, using local copy to avoid dep on fetchpatch.

[1] https://raw.githubusercontent.com/void-linux/void-packages/master/srcpkgs/glib/patches/quark_init_on_demand.patch
2018-06-25 09:47:51 -05:00
Ben Gamari da48154158 glib: Enable cross-compilation
glib needs gettext for the build machine. Since gettext is also a
propagatedBuildInput I'm assuming that it's also used at runtime.
2018-05-03 17:06:01 -04:00
Matthew Bauer 143978a477 treewide: remove platform assertions
linux: readd assertion
2018-05-03 13:09:20 -05:00
Jörg Thalheim 9d6ac12f39 glib: bin/gio is required by gvfs executables
this fixes gvfs in caia (mate desktop)
2018-04-06 00:21:46 +01:00
Will Dietz f623858a82 glib: no one wants --witih-libiconv=gnu
Previously this was set on FreBSD and SunOS...
2018-03-25 21:17:49 -05:00
Matthew Justin Bauer 8349d73c8f
glib: oops 2018-03-25 02:00:32 -05:00
Matthew Justin Bauer d0384cc7b8
glib: propagate gettext/iconv 2018-03-25 01:56:57 -05:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar 0973618e4e
gnome3: automated update 2018-03-22 07:46:42 +01:00
Jan Tojnar c02794b666
glib: add updateScript 2018-03-04 20:05:51 +01:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
John Ericson 82ebace595 glibc: Fix Darwin build
Fix the failure caused in #34198 by a suggested change of mine. @vcunat
reported in [1].

[1]: https://github.com/NixOS/nixpkgs/pull/34198#issuecomment-361075911
2018-01-29 00:47:02 -05:00
Ben Gamari c68aa532d6 glib: Allow cross compilation
tweaked to handle non-glibc along with others
2018-01-24 09:33:37 -06:00
Vladimír Čunát 081b9c9d96
glib: 2.54.2 -> 2.54.3 (maintenance) 2018-01-21 16:09:24 +01: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 9642fb40e8
glib: maintenance 2.54.1 -> 2.54.2 2017-11-27 13:54:15 +01:00
Jan Tojnar 1f79b943c0
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 overriden 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-15 03:45:24 +01:00
Vladimír Čunát 714a168052
glib: maintenance 2.54.0 -> 2.54.1 2017-10-08 18:24:12 +02:00
Vladimír Čunát 00b4e2646c
glib: 2.52.3 -> 2.54.0
License was updated upstream.  Also tidy the expression a bit,
and unify the nix coding style.
2017-09-24 11:28:31 +02:00
Linus Heckemann b73e3b6095 GNOME: 3.22 -> 3.24
This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
2017-08-28 15:32:49 +01:00
mimadrid 09e0cc7cc7
Update homepage attributes: http -> https
Homepage link "http://.../" is a permanent redirect to "https://.../" and should be updated
https://repology.org/repository/nix_stable/problems
2017-08-03 11:56:15 +02:00
David McFarland 504f11bbab glib: allow cygwin 2017-06-26 09:26:10 -03:00
Vladimír Čunát 878bbaf4e9
glib: 2.50.3 -> 2.52.1 2017-04-14 12:28:01 +02:00
Vladimír Čunát 96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Vladimír Čunát dbae14164b
glib: maintenance 2.50.2 -> 2.50.3 2017-02-20 21:33:03 +01:00
Vladimír Čunát ff62e8a72e
glib: avoid runtime reference from gtk3
Fixes #21022.  Related: #15931.
2016-12-09 18:53:39 +01:00
Vladimír Čunát b78ea7f6e0
glib: maintenance 2.50.1 -> 2.50.2 2016-12-03 12:33:13 +01:00
Alexander Ried 83c594fe38 glib: 2.50.0 -> 2.50.1 2016-10-11 18:03:47 +02:00
Alexander Ried 868eb83019 glib: 2.48.2 -> 2.50.0
glib now uses libmount per default -> depend on utillinux.
To avoid circular dependency (glib, utillinux, systemd, glib) use the
minimal version
2016-09-22 22:19:06 +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
Vladimír Čunát 532f88cd3a glib: bugfix 2.48.1 -> 2.48.2
Suggested on #17852.
2016-08-20 01:18:03 +02:00