diff options
Diffstat (limited to 'pkgs/applications/audio/musikcube/default.nix')
-rw-r--r-- | pkgs/applications/audio/musikcube/default.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 0894a6410d8..273b62401e8 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -9,6 +9,8 @@ , lame , libev , libmicrohttpd +, libopenmpt +, mpg123 , ncurses , lib , stdenv @@ -25,25 +27,25 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg="; + sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; }; - patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/clangen/musikcube/pull/474 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; - sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; - }) - ./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 @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { lame libev libmicrohttpd + libopenmpt + mpg123 ncurses taglib ] ++ lib.optionals systemdSupport [ |