From 5699a12b80c84af7474d7c83c2bbda5cd5df3f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Feb 2018 09:34:13 +0100 Subject: [PATCH] Revert "libjack2: fix build with gcc-7 via upstream patch" This reverts commit 4efdd7e87dde31fe301a7d28050ba577ad496845. libjack2 was updated in the meantime. --- pkgs/misc/jackaudio/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index 31422b4d7b0..a242f0261c7 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper , bash, libsamplerate, libsndfile, readline, eigen, celt # Darwin Dependencies , aften, AudioToolbox, CoreAudio, CoreFoundation @@ -41,23 +41,14 @@ stdenv.mkDerivation rec { optDbus optPythonDBus optLibffado optAlsaLib optLibopus ] ++ stdenv.lib.optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ]; + # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet. + patches = stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ]; + prePatch = '' substituteInPlace svnversion_regenerate.sh \ --replace /bin/bash ${bash}/bin/bash ''; - patches = - # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet. - stdenv.lib.optionals stdenv.isDarwin [ ./clang.patch ./darwin-cf.patch ] - ++ stdenv.lib.optional (!stdenv.isDarwin) [ # collides with ./clang.patch - (fetchpatch { - name = "gcc-7.patch"; - url = "https://patch-diff.githubusercontent.com/raw/jackaudio/jack2/pull/277.diff"; - sha256 = "003xy7rd0fa8ss7wy0qhl4rm8sv5w0y46r7x76iac0km318ydkbv"; - }) - ]; - - # It looks like one of the frameworks depends on # since frameworks are impure we also have to use the impure CoreFoundation here. # FIXME: remove when CoreFoundation is updated to 10.11