musikcube: Replace local patch with upstream patch

This commit is contained in:
Alexis Hildebrandt 2022-07-11 20:57:24 +02:00
parent 220238e223
commit 122db56f14
2 changed files with 10 additions and 17 deletions

View file

@ -1,14 +0,0 @@
diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt
index f42748aa..ae339946 100644
--- a/src/musikcube/CMakeLists.txt
+++ b/src/musikcube/CMakeLists.txt
@@ -98,9 +98,6 @@ else()
endif()
if (APPLE)
- message(STATUS "[ncurses] detected Darwin, linking statically")
- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a")
- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a")
else()
message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo")
find_library(LIBTINFO NAMES tinfo)

View file

@ -36,9 +36,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik=";
}; };
patches = [ patches = []
./0001-apple-cmake.patch ++ lib.optionals stdenv.isDarwin [
]; # Fix pending upstream inclusion for Darwin nixpkgs builds:
# https://github.com/clangen/musikcube/pull/531
(fetchpatch {
name = "darwin-build.patch";
url = "https://github.com/clangen/musikcube/commit/9077bb9fa6ddfe93ebb14bb8feebc8a0ef9b7ee4.patch";
sha256 = "sha256-Am9AGKDGMN5z+JJFJKdsBLrHf2neHFovgF/8I5EXLDA=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake