Commit Graph

212 Commits

Author SHA1 Message Date
Jan Tojnar
1c9ba9f6ab
glib.setupHook: fix make_glib_find_gsettings_schemas
GSETTINGS_SCHEMAS_PATH needs to contain a list of directories containing glib-2.0/schemas.
770a4c7946 broke that by accidentally adding glib-2.0 to the paths.
2019-11-21 22:32:16 +01:00
John Ericson
5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
2019-11-08 15:26:14 -05:00
John Ericson
f7fdc997bf Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars 2019-11-08 13:58:27 -05:00
John Ericson
770a4c7946 glib: Fix setup hook
It was not robust against multiple matching directories, as the called
function takes exactly 3 arguments.
2019-11-08 13:24:18 -05:00
Michael Raskin
85b6129513
Merge pull request #72518 from r-ryantm/auto-update/glib
glib: 2.62.1 -> 2.62.2
2019-11-02 09:06:09 +00:00
R. RyanTM
1c253da73d glib: 2.62.1 -> 2.62.2 2019-11-01 20:13:05 -07:00
Frederik Rietdijk
bcf59bbfcb Merge staging into staging-next 2019-10-29 09:53:21 +01:00
worldofpeace
0cf598c3d9 glib: add worldofpeace to maintainers 2019-10-28 20:41:36 -04:00
Jan Tojnar
2ded9c2d8a
glib: enable separate debug info 2019-10-27 15:33:24 +01:00
Tor Hedin Brønner
02b966ab92 glib: 2.62.0 → 2.62.1 2019-10-12 11:04:27 +02:00
Tor Hedin Brønner
259556da8a glib: fix loading dylibs through gobject on darwin 2019-10-03 10:39:14 -04:00
Tor Hedin Brønner
1e3e7822a6 glib: 2.60.7 -> 2.62.0
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
2019-09-30 19:39:38 +02:00
Will Dietz
59ed1d94c9
glib: 2.60.6 -> 2.60.7
https://gitlab.gnome.org/GNOME/glib/-/tags/2.60.7
2019-09-03 19:18:53 -05:00
worldofpeace
ed2aa6313f glib: add getSchemaPath 2019-08-26 21:28:13 -04:00
worldofpeace
b7fa073196 glib: add makeSchemaPath 2019-08-26 07:03:39 -04:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
worldofpeace
b95130133a
Merge pull request #65930 from r-ryantm/auto-update/glib
glib: 2.60.4 -> 2.60.6
2019-08-05 11:33:39 -04:00
worldofpeace
f2eddec042 glib: drop define BSD_COMP
I fail to see where or for what it is useful for.
2019-08-05 06:19:44 -04:00
worldofpeace
60266eb504 glib: add cflag G_DISABLE_CAST_CHECKS
This is what would have been passed before with the release
buildtype.

See: https://gitlab.gnome.org/GNOME/glib/blob/2.60.4/meson.build#L208
2019-08-05 06:10:50 -04:00
R. RyanTM
f2d6a195a1 glib: 2.60.4 -> 2.60.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glib/versions
2019-08-04 05:01:58 -07:00
R. RyanTM
db0655886d glib: 2.60.3 -> 2.60.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glib/versions
2019-07-17 10:43:46 +02:00
Daiderd Jordan
b74a025f7f
glib: remove cf-private 2019-07-03 22:20:24 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
R. RyanTM
50ba595d2c glib: 2.60.2 -> 2.60.3
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/glib/versions
2019-06-01 12:01:59 -07:00
worldofpeace
a6ca1a8441 glib: 2.60.1 -> 2.60.2
https://gitlab.gnome.org/GNOME/glib/blob/2.60.2/NEWS
2019-05-07 12:55:37 -04:00
Tor Hedin Brønner
94153e96ee glib: 2.60.0 → 2.60.1
https://gitlab.gnome.org/GNOME/glib/blob/2.60.1/NEWS
2019-04-27 07:09:33 +02:00
Tor Hedin Brønner
e7bc21bacd
glib: 2.58.3 -> 2.60.0
- `install_dir : bin` fix is now upstream
- We now need to pass `nls=enabled` to install po/Makefile.in.in
2019-04-05 11:39:58 +02:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (693 commits)
  buildGoModule: use go_1_12 instead of go_1_11 (#58103)
  gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091)
  signal-desktop: 1.22.0 -> 1.23.0
  added missing semicolon to documentation
  terminus_font_ttf: 4.46.0 -> 4.47.0
  buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071)
  dav1d: init at 0.2.1
  dropbox-cli: 2018.11.28 -> 2019.02.14
  atlassian-confluence: 6.14.1 -> 6.14.2
  maintainers: update email for dywedir
  python.pkgs.hglib: use patch to specify hg path (#57926)
  chkrootkit: 0.52 -> 0.53
  radare2-cutter: 1.7.2 -> 1.8.0
  autorandr: 1.7 -> 1.8
  pythonPackages.pyhepmc: fix build
  llvm-polly/clang-polly: use latest llvm
  apulse: 0.1.11.1 -> 0.1.12, cleanup
  factorio: experimental 0.17.14 → 0.17.16 (#58000)
  sequeler: 0.6.7 -> 0.6.8
  nasc: 0.5.1 -> 0.5.2
  ...
2019-03-21 21:01:25 -07:00
Jan Malakhovski
2bc525350a treewide: stdenv.config -> config
That attribute does not exist.
2019-03-14 14:01:21 +00:00
Tor Hedin Brønner
295443bce5
glib: 2.58.2 -> 2.58.3 (#56385)
Drop patches that are now upstream.
2019-02-26 16:35:33 +01:00
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