From 3aeccf6d942c6735ae985bbd5567d4de770f4114 Mon Sep 17 00:00:00 2001 From: Myles Wirth Date: Tue, 10 Mar 2026 12:11:39 -0400 Subject: [PATCH] libresprite: diff to remove homebrew interference libresprite: removed darwin broken designation --- pkgs/by-name/li/libresprite/no-brew.patch | 19 +++++++++++++++++++ pkgs/by-name/li/libresprite/package.nix | 5 +++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 pkgs/by-name/li/libresprite/no-brew.patch diff --git a/pkgs/by-name/li/libresprite/no-brew.patch b/pkgs/by-name/li/libresprite/no-brew.patch new file mode 100644 index 000000000000..2556850c08bd --- /dev/null +++ b/pkgs/by-name/li/libresprite/no-brew.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1234567..abcdefg 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,14 +151,4 @@ include_directories(${ZLIB_INCLUDE_DIRS}) + + # libArchive +-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- # Homebrew ships libarchive keg only, include dirs have to be set manually +- execute_process( +- COMMAND brew --prefix libarchive +- OUTPUT_VARIABLE LIBARCHIVE_PREFIX +- OUTPUT_STRIP_TRAILING_WHITESPACE +- COMMAND_ERROR_IS_FATAL ANY +- ) +- set(LibArchive_INCLUDE_DIR "${LIBARCHIVE_PREFIX}/include") +-endif() + find_package(LibArchive REQUIRED) + include_directories(${LibArchive_INCLUDE_DIR}) diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index f3a635d2779a..630508099365 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # From https://github.com/LibreSprite/LibreSprite/pull/565 ./cmake4.diff + # Remove Homebrew-specific brew invocation for libarchive on Darwin; + # Nix provides libarchive directly via buildInputs. + ./no-brew.patch ]; nativeBuildInputs = [ cmake @@ -110,7 +113,5 @@ stdenv.mkDerivation (finalAttrs: { ''; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; - # https://github.com/LibreSprite/LibreSprite/issues/308 - broken = stdenv.hostPlatform.isDarwin; }; })