From 26ad5d1277477f1fda1082a9ce20898bcf23ae49 Mon Sep 17 00:00:00 2001 From: andre4ik3 Date: Thu, 25 Sep 2025 18:30:05 +0000 Subject: [PATCH] afflib: fix build on darwin, remove libiconv --- pkgs/by-name/af/afflib/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/af/afflib/package.nix b/pkgs/by-name/af/afflib/package.nix index 84229d987a1b..b8076df609dd 100644 --- a/pkgs/by-name/af/afflib/package.nix +++ b/pkgs/by-name/af/afflib/package.nix @@ -5,21 +5,21 @@ zlib, curl, expat, + fuse, fuse3, openssl, autoreconfHook, python3, - libiconv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "3.7.22"; pname = "afflib"; src = fetchFromGitHub { owner = "sshock"; repo = "AFFLIBv3"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-pGInhJQBhFJhft/KfB3J3S9/BVp9D8TZ+uw2CUNVC+Q="; }; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { openssl python3 ] - ++ lib.optionals (with stdenv; isLinux || isDarwin) [ fuse3 ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ fuse ]; meta = { homepage = "http://afflib.sourceforge.net/"; @@ -42,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ lib.maintainers.raskin ]; downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; -} +})