From 99e0607c5a9c8e41d2e6769d01bf059a873b0e29 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 23 Jul 2023 21:28:33 -0400 Subject: [PATCH] libicns: 0.8.1 -> unstable-2022-04-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libicns hasn’t had a release in over a decade, but development has continued upstream. Updating removes the need for the openjp2 patch and includes fixes needed to build with newer versions of clang. --- .../development/libraries/libicns/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 6dd6654b35ad..45fad4459a8c 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -1,24 +1,18 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, libpng, openjpeg }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libpng, openjpeg, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "libicns"; - version = "0.8.1"; + version = "unstable-2022-04-10"; - src = fetchurl { - url = "mirror://sourceforge/icns/${pname}-${version}.tar.gz"; - sha256 = "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"; + src = fetchgit { + name = "libicns"; + url = "https://git.code.sf.net/p/icns/code"; + rev = "921f972c461c505e5ac981aaddbdfdde97e8bb2b"; + hash = "sha256-YeO0rlTujDNmrdJ3DRyl3TORswF2KFKA+wVUxJo8Dno"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/libi/libicns/0.8.1-3.1/debian/patches/support-libopenjp2.patch"; - sha256 = "0ss298lyzvydxvaxsadi6kbbjpwykd86jw3za76brcsg2dpssgas"; - }) - ]; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libpng openjpeg ]; - env.NIX_CFLAGS_COMPILE = toString [ "-I${openjpeg.dev}/include/${openjpeg.incDir}" ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libpng openjpeg zlib ]; meta = with lib; { description = "Library for manipulation of the Mac OS icns resource format";