diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gspell')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gspell/default.nix | 19 |
2 files changed, 12 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch b/nixpkgs/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch index b2e71fe3aed1..6200dca189f8 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch +++ b/nixpkgs/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/nixpkgs/pkgs/development/libraries/gspell/default.nix b/nixpkgs/pkgs/development/libraries/gspell/default.nix index d4bd149e64e3..d3ddb25ed0e9 100644 --- a/nixpkgs/pkgs/development/libraries/gspell/default.nix +++ b/nixpkgs/pkgs/development/libraries/gspell/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib +, buildPackages , fetchurl , pkg-config , libxml2 @@ -11,23 +13,23 @@ , vala , gobject-introspection , gnome -, gtk-mac-integration }: stdenv.mkDerivation rec { pname = "gspell"; - version = "1.11.1"; + 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 = "72qk4/cRd1FYp+JBpfgJzyQmvA4Cwjp9K1xx/D3gApI="; + 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 ]; @@ -38,14 +40,12 @@ stdenv.mkDerivation rec { libxml2 autoreconfHook gtk-doc + glib ]; buildInputs = [ - glib gtk3 icu - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - gtk-mac-integration ]; propagatedBuildInputs = [ @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { enchant2 ]; + configureFlags = [ + "GLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" + "GLIB_MKENUMS=${lib.getDev buildPackages.glib}/bin/glib-mkenums" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; |