diff options
| author | Alexis Hildebrandt <afh@surryhill.net> | 2022-07-11 20:57:24 +0200 |
|---|---|---|
| committer | Alexis Hildebrandt <afh@surryhill.net> | 2022-07-11 20:57:24 +0200 |
| commit | 122db56f1472481435432b546521e930a70782c5 (patch) | |
| tree | dd8170ff207e9c05bd24053d3534d00c78378fd3 /pkgs | |
| parent | 220238e223d89488fb3fdd9a6a8113c18714f8ca (diff) | |
| download | nixpkgs-122db56f1472481435432b546521e930a70782c5.tar nixpkgs-122db56f1472481435432b546521e930a70782c5.tar.gz nixpkgs-122db56f1472481435432b546521e930a70782c5.tar.bz2 nixpkgs-122db56f1472481435432b546521e930a70782c5.tar.lz nixpkgs-122db56f1472481435432b546521e930a70782c5.tar.xz nixpkgs-122db56f1472481435432b546521e930a70782c5.tar.zst nixpkgs-122db56f1472481435432b546521e930a70782c5.zip | |
musikcube: Replace local patch with upstream patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/audio/musikcube/0001-apple-cmake.patch | 14 | ||||
| -rw-r--r-- | pkgs/applications/audio/musikcube/default.nix | 13 |
2 files changed, 10 insertions, 17 deletions
diff --git a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch b/pkgs/applications/audio/musikcube/0001-apple-cmake.patch deleted file mode 100644 index 3c4630af4aa..00000000000 --- a/pkgs/applications/audio/musikcube/0001-apple-cmake.patch +++ /dev/null @@ -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) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 2f60e9c257c..273b62401e8 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -36,9 +36,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; }; - patches = [ - ./0001-apple-cmake.patch - ]; + patches = [] + ++ 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 = [ cmake |