From 238fcd35f596a161423e71cfe8dfd462461a665b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 11:56:40 +0800 Subject: [PATCH] =?UTF-8?q?gspell:=201.12.0=20=E2=86=92=201.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gspell/-/compare/1.12.0...1.12.1 --- .../libraries/gspell/0001-Darwin-build-fix.patch | 8 -------- pkgs/development/libraries/gspell/default.nix | 11 +++++------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch index b2e71fe3aed..6200dca189f 100644 --- a/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch +++ b/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch @@ -11,14 +11,6 @@ diff --git a/gspell/Makefile.am b/gspell/Makefile.am index 69ee421..7c58973 100644 --- a/gspell/Makefile.am +++ b/gspell/Makefile.am -@@ -95,6 +95,7 @@ nodist_libgspell_core_la_SOURCES = \ - $(BUILT_SOURCES) - - libgspell_core_la_LIBADD = \ -+ $(GTK_MAC_LIBS) \ - $(CODE_COVERAGE_LIBS) - - libgspell_core_la_CFLAGS = \ @@ -161,6 +162,12 @@ gspell_private_headers += \ gspell_private_c_files += \ gspell-osx.c diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index f27e0e7be60..d3ddb25ed0e 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , buildPackages , fetchurl , pkg-config @@ -12,23 +13,23 @@ , vala , gobject-introspection , gnome -, gtk-mac-integration }: stdenv.mkDerivation rec { pname = "gspell"; - version = "1.12.0"; + version = "1.12.1"; outputs = [ "out" "dev" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "QNKFDxu26HdSRvoeOUOLNsqvvbraHSihn6HKB+H/gq0="; + sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE="; }; patches = [ # Extracted from: https://github.com/Homebrew/homebrew-core/blob/2a27fb86b08afc7ae6dff79cf64aafb8ecc93275/Formula/gspell.rb#L125-L149 + # Dropped the GTK_MAC_* changes since gtk-mac-integration is not needed since 1.12.1 ./0001-Darwin-build-fix.patch ]; @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 icu - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - gtk-mac-integration ]; propagatedBuildInputs = [