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

Merge branch 'phonon'

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-11 09:06:12 -06:00
commit 46c44a40f5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
View File

@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; 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 ]; nativeBuildInputs = [ cmake pkgconfig ];
cmakeFlags = [ cmakeFlags = [

9
pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
View File

@ -15,7 +15,14 @@ stdenv.mkDerivation rec {
sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; 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 ]; nativeBuildInputs = [ cmake pkgconfig ];