From 2e29f5f93423838729ddd7dca07ac5c66d6e4cd4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 26 May 2020 21:16:18 -0400 Subject: [PATCH] musikcube: 0.90.1 -> 0.92.1 --- pkgs/applications/audio/musikcube/default.nix | 11 ++++++----- pkgs/applications/audio/musikcube/dont-strip.patch | 14 -------------- 2 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/audio/musikcube/dont-strip.patch diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 0c076946b927..52fc96bb681f 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,18 +17,15 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.90.1"; + version = "0.92.1"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg"; + sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr"; }; - # https://github.com/clangen/musikcube/issues/339 - patches = [ ./dont-strip.patch ]; - nativeBuildInputs = [ cmake pkg-config @@ -46,6 +43,10 @@ stdenv.mkDerivation rec { taglib ] ++ stdenv.lib.optional systemdSupport systemd; + cmakeFlags = [ + "-DDISABLE_STRIP=true" + ]; + meta = with stdenv.lib; { description = "A fully functional terminal-based music player, library, and streaming audio server"; homepage = "https://musikcube.com/"; diff --git a/pkgs/applications/audio/musikcube/dont-strip.patch b/pkgs/applications/audio/musikcube/dont-strip.patch deleted file mode 100644 index b7385dcddba9..000000000000 --- a/pkgs/applications/audio/musikcube/dont-strip.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3e02666..7c43c7e6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -370,9 +370,3 @@ endif() - # they don't yet exist! - add_custom_target(postbuild ALL DEPENDS musikcube musikcubed) - add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .) -- --# strip binaries in release mode --if (CMAKE_BUILD_TYPE MATCHES Release) -- message(STATUS "stripping binaries...") -- add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh") --endif()