From f90d34b4159bc6d33d677dfed2edb6491d8b541d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Jul 2025 14:39:43 +0200 Subject: [PATCH 1/3] libtorrent-rasterbar-2_0_x: use --replace-fail --- pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 2c7c53c46353..c1789401d9af 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation { # https://github.com/arvidn/libtorrent/issues/6865 postPatch = '' substituteInPlace cmake/Modules/GeneratePkgConfig/target-compile-settings.cmake.in \ - --replace 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ - 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") - set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")' + --replace-fail 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")' \ + 'set(_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") + set(_INSTALL_FULL_LIBDIR "@CMAKE_INSTALL_FULL_LIBDIR@")' substituteInPlace cmake/Modules/GeneratePkgConfig/pkg-config.cmake.in \ - --replace '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@ + --replace-fail '$'{prefix}/@_INSTALL_LIBDIR@ @_INSTALL_FULL_LIBDIR@ ''; postInstall = '' @@ -64,7 +64,7 @@ stdenv.mkDerivation { postFixup = '' substituteInPlace "$dev/lib/cmake/LibtorrentRasterbar/LibtorrentRasterbarTargets-release.cmake" \ - --replace "\''${_IMPORT_PREFIX}/lib" "$out/lib" + --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib" ''; outputs = [ From 501471b6ec62d9a4aafbf84d5052cf2328c6fc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Jul 2025 14:58:57 +0200 Subject: [PATCH 2/3] libtorrent-rasterbar-2_0_x: fix cross compilation --- pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index c1789401d9af..9b959a454fe4 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -32,16 +32,20 @@ stdenv.mkDerivation { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + python3 + ]; buildInputs = [ boostPython openssl zlib - python3 ncurses ]; + strictDeps = true; + patches = [ # provide distutils alternative for python 3.12 ./distutils.patch From a6c744adf0f6fbd6629defdf92d332b3e035061e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Jul 2025 14:59:10 +0200 Subject: [PATCH 3/3] libtorrent-rasterbar-2_0_x: drop unused dependencies --- pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 9b959a454fe4..d4371b7720e8 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation { buildInputs = [ boostPython openssl - zlib - ncurses ]; strictDeps = true;