summary refs log tree commit diff
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-02-28 15:44:58 +0100
committerajs124 <git@ajs124.de>2021-03-01 14:24:57 +0100
commit47bae87b758fc2ed20317b48f8db1592739f0d46 (patch)
tree9187e96bf39c09f5ea5559ceaad8027bf37646b2
parente72375464b32eac1d749e4905c17baf68320c73b (diff)
downloadnixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar.gz
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar.bz2
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar.lz
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar.xz
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.tar.zst
nixpkgs-47bae87b758fc2ed20317b48f8db1592739f0d46.zip
gnustep.base: fix icu 68 compatibility
-rw-r--r--pkgs/desktops/gnustep/base/default.nix10
1 files 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";