Merge pull request #88998 from aanderse/musikcube

musikcube: 0.90.1 -> 0.92.1
This commit is contained in:
Aaron Andersen 2020-05-29 06:46:16 -04:00 committed by GitHub
commit 22a231ce27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions

View file

@ -17,18 +17,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "musikcube"; pname = "musikcube";
version = "0.90.1"; version = "0.92.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "clangen"; owner = "clangen";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg"; sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr";
}; };
# https://github.com/clangen/musikcube/issues/339
patches = [ ./dont-strip.patch ];
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
@ -46,6 +43,10 @@ stdenv.mkDerivation rec {
taglib taglib
] ++ stdenv.lib.optional systemdSupport systemd; ] ++ stdenv.lib.optional systemdSupport systemd;
cmakeFlags = [
"-DDISABLE_STRIP=true"
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A fully functional terminal-based music player, library, and streaming audio server"; description = "A fully functional terminal-based music player, library, and streaming audio server";
homepage = "https://musikcube.com/"; homepage = "https://musikcube.com/";

View file

@ -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()