public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: 2.58.3 -> 2.60.0

Browse Source 
- `install_dir : bin` fix is now upstream
- We now need to pass `nls=enabled` to install po/Makefile.in.in
This commit is contained in:
Tor Hedin Brønner 2019-03-03 17:33:22 +01:00 committed by Jan Tojnar
parent cb1a20499a
commit e7bc21bacd
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/glib/default.nix
View File

@ -46,7 +46,7 @@ let
''; '';
binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ]; binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
version = "2.58.3"; version = "2.60.0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "10blprf5djbwxq8dqmjvcsdc9vqz63rl0ammfbd2b2p8cwbw6hwg"; sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0";
}; };
patches = optional stdenv.isDarwin ./darwin-compilation.patch 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. # Avoid the need for gobject introspection binaries in PATH in cross-compiling case.
# Instead we just copy them over from the native output. # Instead we just copy them over from the native output.
"-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}" "-Dgtk_doc=${if stdenv.hostPlatform == stdenv.buildPlatform then "true" else "false"}"
"-Dnls=enabled"
]; ];
LC_ALL = "en_US.UTF-8"; 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 = '' postPatch = ''
substituteInPlace meson.build --replace "install_dir : 'bin'," "install_dir : glib_bindir,"
# substitute fix-gio-launch-desktop-path.patch # substitute fix-gio-launch-desktop-path.patch
substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin"