From bf7d1857021448dfa5ba3dee2b0501709b5f7c2b Mon Sep 17 00:00:00 2001 From: Mohamed Gaber Date: Thu, 22 Aug 2024 16:07:19 +0300 Subject: [PATCH] libjodycode: fix on darwin by adding fixDarwinDylibNames Packages dependent on `libjodycode` on macOS (read: `jdupes`) fail to launch because the dylib generated does not set an absolute install path. `fixDarwinDylibNames` rectifies this. --- .../libraries/libjodycode/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libjodycode/default.nix b/pkgs/development/libraries/libjodycode/default.nix index b2ce994dc5b92..28a564c9bc913 100644 --- a/pkgs/development/libraries/libjodycode/default.nix +++ b/pkgs/development/libraries/libjodycode/default.nix @@ -3,9 +3,10 @@ stdenv, fetchFromGitea, jdupes, + fixDarwinDylibNames, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libjodycode"; version = "3.1.1"; @@ -19,21 +20,23 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "jbruchon"; repo = "libjodycode"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-sVEa2gNvgRJK1Ycmv4inbViTBPQFjzcZ8XHlAdsNzOk="; }; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + env.PREFIX = placeholder "out"; passthru.tests = { inherit jdupes; }; - meta = with lib; { + meta = { description = "Shared code used by several utilities written by Jody Bruchon"; - homepage = "https://github.com/jbruchon/libjodycode"; - changelog = "https://github.com/jbruchon/libjodycode/blob/${src.rev}/CHANGES.txt"; - license = licenses.mit; - maintainers = with maintainers; [ pbsds ]; + homepage = "https://codeberg.org/jbruchon/libjodycode"; + changelog = "https://codeberg.org/jbruchon/libjodycode/src/branch/master/CHANGES.txt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; }; -} +})