From 47bae87b758fc2ed20317b48f8db1592739f0d46 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 28 Feb 2021 15:44:58 +0100 Subject: gnustep.base: fix icu 68 compatibility --- pkgs/desktops/gnustep/base/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnustep/base/default.nix b/pkgs/desktops/gnustep/base/default.nix index 8cc68b75569..8fe232dff7b 100644 --- a/pkgs/desktops/gnustep/base/default.nix +++ b/pkgs/desktops/gnustep/base/default.nix @@ -1,7 +1,7 @@ { aspell, audiofile , gsmakeDerivation , cups -, fetchurl +, fetchurl, fetchpatch , gmp, gnutls , libffi, binutils-unwrapped , libjpeg, libtiff, libpng, giflib, libungif @@ -33,7 +33,13 @@ gsmakeDerivation { portaudio libiberty ]; - patches = [ ./fixup-paths.patch ]; + patches = [ + ./fixup-paths.patch + (fetchpatch { # for icu68 compatibility, remove with next update(?) + url = "https://github.com/gnustep/libs-base/commit/06fa7792a51cb970e5d010a393cb88eb127830d7.patch"; + sha256 = "150n1sa34av9ywc04j36jvj7ic9x6pgr123rbn2mx5fj76q23852"; + }) + ]; meta = { description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; -- cgit 1.4.1