From 7456e368369ab767c42db2688dc250b4378d7178 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 31 Dec 2024 00:09:42 -0800 Subject: [PATCH] libspnav: set install_name at link time; fix darwin install_name_tool fails due to a lack of space to write the full path name into the library. Set the correct path at link time and eliminate the install_name_tool step. --- pkgs/by-name/li/libspnav/package.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libspnav/package.nix b/pkgs/by-name/li/libspnav/package.nix index 92d3baa5541c..51a4805581ac 100644 --- a/pkgs/by-name/li/libspnav/package.nix +++ b/pkgs/by-name/li/libspnav/package.nix @@ -3,7 +3,6 @@ lib, fetchFromGitHub, libX11, - fixDarwinDylibNames, }: stdenv.mkDerivation rec { @@ -17,14 +16,18 @@ stdenv.mkDerivation rec { hash = "sha256-qBewSOiwf5iaGKLGRWOQUoHkUADuH8Q1mJCLiWCXmuQ="; }; - nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libX11 ]; configureFlags = [ "--disable-debug" ]; - makeFlags = [ - "CC=${stdenv.cc.targetPrefix}cc" - "AR=${stdenv.cc.targetPrefix}ar" - ]; + makeFlags = + [ + "CC=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "shared=-dynamiclib" + "shared+=-Wl,-install_name,$(out)/lib/$(lib_so)" + ]; preInstall = '' mkdir -p $out/{lib,include}