glib: 2.70.3 → 2.71.2
https://gitlab.gnome.org/GNOME/glib/-/compare/2.70.3...2.71.2
This commit is contained in:
parent
7d2ded8c0f
commit
0193debd1c
|
@ -45,16 +45,15 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "glib";
|
||||
version = "2.70.3";
|
||||
version = "2.71.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "Iz+khBweGeOW23YH1Y9rdbozE8UL8Pzgey41MtXrfUY=";
|
||||
sha256 = "33BYdnULlS6ygqjPFdvXfcYJFSo2aXS0klqSskT+Y+E=";
|
||||
};
|
||||
|
||||
patches = optionals stdenv.isDarwin [
|
||||
./darwin-compilation.patch
|
||||
./link-with-coreservices.patch
|
||||
] ++ optionals stdenv.hostPlatform.isMusl [
|
||||
./quark_init_on_demand.patch
|
||||
./gobject_init_on_demand.patch
|
||||
|
@ -142,8 +141,8 @@ stdenv.mkDerivation rec {
|
|||
chmod +x docs/reference/gio/concat-files-helper.py
|
||||
patchShebangs docs/reference/gio/concat-files-helper.py
|
||||
patchShebangs glib/gen-unicode-tables.pl
|
||||
patchShebangs tests/gen-casefold-txt.py
|
||||
patchShebangs tests/gen-casemap-txt.py
|
||||
patchShebangs glib/tests/gen-casefold-txt.py
|
||||
patchShebangs glib/tests/gen-casemap-txt.py
|
||||
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
|
||||
substituteInPlace gio/win32/meson.build \
|
||||
--replace "libintl, " ""
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- a/meson.build.orig 2020-11-25 13:47:38.499149252 +0900
|
||||
+++ b/meson.build 2020-11-25 13:48:47.098444800 +0900
|
||||
@@ -742,7 +742,7 @@
|
||||
|
||||
if glib_have_carbon
|
||||
glib_conf.set('HAVE_CARBON', true)
|
||||
- osx_ldflags += '-Wl,-framework,Carbon'
|
||||
+ osx_ldflags += ['-Wl,-framework,Carbon', '-Wl,-framework,CoreServices']
|
||||
glib_have_os_x_9_or_later = objcc.compiles('''#include <AvailabilityMacros.h>
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
|
||||
#error Compiling for minimum OS X version before 10.9
|
Loading…
Reference in a new issue