Loading pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch +0 −8 Original line number Diff line number Diff line Loading @@ -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 Loading pkgs/development/libraries/gspell/default.nix +5 −6 Original line number Diff line number Diff line { lib, stdenv { stdenv , lib , buildPackages , fetchurl , pkg-config Loading @@ -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 ]; Loading @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 icu ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; propagatedBuildInputs = [ Loading Loading
pkgs/development/libraries/gspell/0001-Darwin-build-fix.patch +0 −8 Original line number Diff line number Diff line Loading @@ -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 Loading
pkgs/development/libraries/gspell/default.nix +5 −6 Original line number Diff line number Diff line { lib, stdenv { stdenv , lib , buildPackages , fetchurl , pkg-config Loading @@ -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 ]; Loading @@ -45,8 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 icu ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gtk-mac-integration ]; propagatedBuildInputs = [ Loading