diff options
| author | Tor Hedin Brønner <torhedinbronner@gmail.com> | 2019-03-03 17:33:22 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-04-05 11:39:58 +0200 |
| commit | e7bc21bacd453811fe1c44df5d4abd5d864d0f1b (patch) | |
| tree | 4c0477f33cb6f7339b298b3cd1030018f3d5835e /pkgs/development/libraries/glib/default.nix | |
| parent | cb1a20499a8438ea1f15140dc090256e7690035e (diff) | |
| download | nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar.gz nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar.bz2 nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar.lz nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar.xz nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.tar.zst nixpkgs-e7bc21bacd453811fe1c44df5d4abd5d864d0f1b.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e7d0e9ec423..05a52dce0f9 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -46,7 +46,7 @@ let ''; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; - version = "2.58.3"; + version = "2.60.0"; in stdenv.mkDerivation rec { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg"; + sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -96,15 +96,15 @@ stdenv.mkDerivation rec { # Avoid the need for gobject introspection binaries in PATH in cross-compiling case. # Instead we just copy them over from the native output. "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" + "-Dnls=enabled" ]; LC_ALL = "en_US.UTF-8"; - NIX_CFLAGS_COMPILE = optional stdenv.isSunOS "-DBSD_COMP"; + NIX_CFLAGS_COMPILE = (optional stdenv.isSunOS "-DBSD_COMP") + ++ [ "-Wno-error=nonnull" ]; postPatch = '' - substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir," - # substitute fix-gio-launch-desktop-path.patch substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" |