colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgroove: fix build

Browse Source 
When compiling with GCC v7 and the `-Werror` flag several new warnings
caused the build to fail: https://hydra.nixos.org/build/70751457/nixlog/2

Note: I patched the CMake file manually as v4.3.0 is quite old, a v5 is
in progress, but isn't stable yet, so patching v4 seems to be the better
solution taking stability into account.

See tickets #31747 and #36453
This commit is contained in:
Maximilian Bosch 2018-03-09 11:32:19 +01:00
parent 6fcf691545
commit f3809c6f4a
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/libgroove/default.nix
View File

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
};
patches = [ ./no-warnings-as-errors.patch ];
buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];
meta = with stdenv.lib; {
@ -18,6 +20,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/andrewrk/libgroove;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
maintainers = with maintainers; [ andrewrk ma27 ];
};
}

15
pkgs/development/libraries/libgroove/no-warnings-as-errors.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1e8541..6bc9c30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,8 +135,8 @@ configure_file (
"${PROJECT_BINARY_DIR}/config.h"
)
-set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L")
-set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g")
+set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L")
+set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Wall -g")
set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}")
add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS})