ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-04 03:27:38 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114667 from helsinki-systems/fix/gnustep-base

Browse Source 
gnustep.(base|gui): fix icu 68 compatibility
This commit is contained in:
Mario Rodas 2021-03-01 18:21:48 -05:00 committed by GitHub
commit 32548b0faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/desktops/gnustep/base/default.nix
View File

@ -1,7 +1,7 @@
{ aspell, audiofile { aspell, audiofile
, gsmakeDerivation , gsmakeDerivation
, cups , cups
, fetchurl , fetchurl, fetchpatch
, gmp, gnutls , gmp, gnutls
, libffi, binutils-unwrapped , libffi, binutils-unwrapped
, libjpeg, libtiff, libpng, giflib, libungif , libjpeg, libtiff, libpng, giflib, libungif
@ -33,7 +33,13 @@ gsmakeDerivation {
portaudio portaudio
libiberty 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 = { meta = {
description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa"; description = "An implementation of AppKit and Foundation libraries of OPENSTEP and Cocoa";

10
pkgs/desktops/gnustep/gui/default.nix
View File

@ -1,4 +1,4 @@
{ gsmakeDerivation, fetchurl, base }: { gsmakeDerivation, fetchurl, fetchpatch, base }:
let let
version = "0.28.0"; version = "0.28.0";
in in
@ -9,7 +9,13 @@ gsmakeDerivation {
sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z"; sha256 = "05wk8kbl75qj0jgawgyv9sp98wsgz5vl1s0d51sads0p0kk2sv8z";
}; };
buildInputs = [ base ]; buildInputs = [ base ];
patches = [ ./fixup-all.patch ]; patches = [
./fixup-all.patch
(fetchpatch { # for icu68 compatibility, remove with next update(?)
url = "https://github.com/gnustep/libs-gui/commit/05572b2d01713f5caf07f334f17ab639be8a1cff.patch";
sha256 = "04z287dk8jf3hdwzk8bpnv49qai2dcdlh824yc9bczq291pjy2xc";
})
];
meta = { meta = {
description = "A GUI class library of GNUstep"; description = "A GUI class library of GNUstep";
}; };