cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #181107 from afh/afh-musikcube-0.98.0

Browse source 
musikcube: 0.97.0 -> 0.98.0
This commit is contained in:
Aaron Andersen 2022-07-22 16:07:46 +02:00 committed by GitHub
commit 0f469c8fc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/audio/musikcube/0001-apple-cmake.patch
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)

28
pkgs/applications/audio/musikcube/default.nix
View file

@ -9,6 +9,8 @@
, lame , lame
, libev , libev
, libmicrohttpd , libmicrohttpd
, libopenmpt
, mpg123
, ncurses , ncurses
, lib , lib
, stdenv , stdenv
@ -25,25 +27,25 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musikcube"; pname = "musikcube";
version = "0.97.0"; version = "0.98.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "clangen"; owner = "clangen";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg="; sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik=";
}; };
patches = [ patches = []
# Fix pending upstream inclusion for ncurses-6.3 support: ++ lib.optionals stdenv.isDarwin [
# https://github.com/clangen/musikcube/pull/474 # Fix pending upstream inclusion for Darwin nixpkgs builds:
(fetchpatch { # https://github.com/clangen/musikcube/pull/531
name = "ncurses-6.3.patch"; (fetchpatch {
url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; name = "darwin-build.patch";
sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; url = "https://github.com/clangen/musikcube/commit/9077bb9fa6ddfe93ebb14bb8feebc8a0ef9b7ee4.patch";
}) sha256 = "sha256-Am9AGKDGMN5z+JJFJKdsBLrHf2neHFovgF/8I5EXLDA=";
./0001-apple-cmake.patch })
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@ -58,6 +60,8 @@ stdenv.mkDerivation rec {
lame lame
libev libev
libmicrohttpd libmicrohttpd
libopenmpt
mpg123
ncurses ncurses
taglib taglib
] ++ lib.optionals systemdSupport [ ] ++ lib.optionals systemdSupport [