Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b999b5e80cf5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bb88585479d7
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 12, 2018

  1. Merge #36807: fcgiwrap: avoid failure on warning 

    (cherry picked from commit b0b1de8)
    @vcunat
    vcunat committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0092cf6 View commit details

  2. Merge #36626: libgroove: fix build 

    (cherry picked from commit 8a74c75)
    @vcunat
    vcunat committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bb88585 View commit details
4 changes: 3 additions & 1 deletion pkgs/development/libraries/libgroove/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd";
};

patches = [ ./no-warnings-as-errors.patch ];

buildInputs = [ cmake libav SDL2 chromaprint libebur128 ];

meta = with stdenv.lib; {
description = "Streaming audio processing library";
homepage = https://github.com/andrewrk/libgroove;
license = licenses.mit;
platforms = platforms.unix;
maintainers = [ maintainers.andrewrk ];
maintainers = with maintainers; [ andrewrk ma27 ];
};
}
15 changes: 15 additions & 0 deletions pkgs/development/libraries/libgroove/no-warnings-as-errors.patch
View file
Original file line number Diff line number Diff line change
@@ -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})
1 change: 1 addition & 0 deletions pkgs/servers/fcgiwrap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac";
};

NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough";
configureFlags = [ "--with-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];

nativeBuildInputs = [ autoreconfHook pkgconfig ];