diff options
| author | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2019-03-21 21:01:25 -0700 |
|---|---|---|
| committer | Wael M. Nasreddine <wael.nasreddine@gmail.com> | 2019-03-21 21:01:25 -0700 |
| commit | 5af0780492827a0c9525e255371f9e7df0f3bb1d (patch) | |
| tree | 14bebf201b7402984908f1e5c889d8bedbfc0561 /pkgs/development/libraries/glib | |
| parent | 7957a93520d458727c19532c607f6d7176f78207 (diff) | |
| parent | 52dae14f0c763dd48572058f0f0906166da14c31 (diff) | |
| download | nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar.gz nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar.bz2 nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar.lz nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar.xz nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.tar.zst nixlib-5af0780492827a0c9525e255371f9e7df0f3bb1d.zip | |
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 ...
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7209bdb3df6b..e7d0e9ec423e 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null , buildPackages # this is just for tests (not in the closure of any regular package) -, doCheck ? stdenv.config.doCheckByDefault or false +, doCheck ? config.doCheckByDefault or false , coreutils, dbus, libxml2, tzdata , desktop-file-utils, shared-mime-info , darwin |