git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88998 from aanderse/musikcube

musikcube: 0.90.1 -> 0.92.1

commit22a231ce279829d0c4bddb8bd16381f208f832f9 authorAaron Andersen <aaron@fosslib.net> dateFri 29 May 2020, 06:46 (6 years ago) parent6da14c92e29f5f
2 files changed+6−19
pkgs/applications/audio/musikcube/default.nix+6−5 pkgs/applications/audio/musikcube/dont-strip.patch−14
pkgs/applications/audio/musikcube/default.nix+6−5
@@ -17,18 +17,15 @@
1717
1818stdenv.mkDerivation rec {
1919 pname = "musikcube";
20− version = "0.90.1";
20+ version = "0.92.1";
2121
2222 src = fetchFromGitHub {
2323 owner = "clangen";
2424 repo = pname;
2525 rev = version;
26− sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg";
26+ sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr";
2727 };
2828
29− # https://github.com/clangen/musikcube/issues/339
30− patches = [ ./dont-strip.patch ];
31−
3229 nativeBuildInputs = [
3330 cmake
3431 pkg-config
@@ -46,6 +43,10 @@ stdenv.mkDerivation rec {
4643 taglib
4744 ] ++ stdenv.lib.optional systemdSupport systemd;
4845
46+ cmakeFlags = [
47+ "-DDISABLE_STRIP=true"
48+ ];
49+
4950 meta = with stdenv.lib; {
5051 description = "A fully functional terminal-based music player, library, and streaming audio server";
5152 homepage = "https://musikcube.com/";
pkgs/applications/audio/musikcube/dont-strip.patchdeleted−14
@@ -1,14 +0,0 @@
1−diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index a3e02666..7c43c7e6 100644
3−--- a/CMakeLists.txt
4−+++ b/CMakeLists.txt
5−@@ -370,9 +370,3 @@ endif()
6− # they don't yet exist!
7− add_custom_target(postbuild ALL DEPENDS musikcube musikcubed)
8− add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .)
9−-
10−-# strip binaries in release mode
11−-if (CMAKE_BUILD_TYPE MATCHES Release)
12−- message(STATUS "stripping binaries...")
13−- add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh")
14−-endif()