From 577df36b56894a130c764933c1940c168938693c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 09:04:18 -0600 Subject: [PATCH 1/2] phonon_qt5_backend_gstreamer: fix build with gstreamer-1.6.1 An include flag which should be picked up through pkgconfig is not. The root cause is unknown, but it's simple to add the missing flag to NIX_CFLAGS_COMPILE. --- .../libraries/phonon-backend-gstreamer/qt5/old.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix index bc34d249b46..d91808ec880 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix @@ -15,7 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; }; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ]; + buildInputs = with gst_all_1; [ + gstreamer gst-plugins-base phonon_qt5 qt5.base + ]; + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; nativeBuildInputs = [ cmake pkgconfig ]; From cc64f51baa8f619500adb255fa40bf386faf4374 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2015 09:05:16 -0600 Subject: [PATCH 2/2] qt5Libs.phonon_backend_gstreamer: fix build with gstreamer-1.6.1 An include flag which should be picked up through pkgconfig is not. The root cause is unknown, but it's simple to add the missing flag to NIX_CFLAGS_COMPILE. --- .../libraries/phonon-backend-gstreamer/qt5/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix index 2c6e40eaf73..9866c0a67ce 100644 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + nativeBuildInputs = [ cmake pkgconfig ]; cmakeFlags = [