cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

phonon: fix build after cmake setup hook changes

Browse source
This commit is contained in:
Thomas Tuegel 2016-04-20 09:59:41 -05:00
parent 491f7f017c
commit 01b171c877
4 changed files with 13 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
View file

@ -1,8 +1,7 @@
{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gstreamer
, gst_plugins_base }:
{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all_1 }:
let
version = "4.7.2";
version = "4.8.2";
pname = "phonon-backend-gstreamer";
in
@ -11,18 +10,24 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
sha256 = "1cfjk450aajr8hfhnfq7zbmryprxiwr9ha5x585dsh7mja82mdw0";
sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
};
buildInputs = [ phonon qt4 gstreamer gst_plugins_base ];
buildInputs = with gst_all_1; [ phonon qt4 gstreamer gst-plugins-base ];
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
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"
];
cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
meta = {
homepage = http://phonon.kde.org/;
description = "GStreamer backend for Phonon";
platforms = stdenv.lib.platforms.linux;
};
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

28
pkgs/development/libraries/phonon/qt4/default.nix
View file

@ -1,28 +0,0 @@
{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }:
with stdenv.lib;
let
v = "4.8.1";
in
stdenv.mkDerivation rec {
name = "phonon-${v}";
src = fetchurl {
url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
};
buildInputs = [ qt4 libpulseaudio ];
nativeBuildInputs = [ cmake automoc4 ];
meta = {
homepage = http://phonon.kde.org/;
description = "Multimedia API for Qt";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

38
pkgs/development/libraries/phonon/qt5/default.nix
View file

@ -1,38 +0,0 @@
{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
, qtbase, qtquick1, qttools
, debug ? false }:
with stdenv.lib;
let
v = "4.8.3";
in
stdenv.mkDerivation rec {
name = "phonon-${v}";
src = fetchurl {
url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
};
buildInputs = [ mesa qtbase qtquick1 qttools libpulseaudio ];
nativeBuildInputs = [ cmake pkgconfig ];
NIX_CFLAGS_COMPILE = "-fPIC";
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
"-DPHONON_BUILD_PHONON4QT5=ON"
"-DCMAKE_INSTALL_LIBDIR=lib"
];
meta = {
homepage = http://phonon.kde.org/;
description = "Multimedia API for Qt";
license = stdenv.lib.licenses.lgpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -8440,7 +8440,7 @@ in
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
phonon = callPackage ../development/libraries/phonon/qt4 {};
phonon = callPackage ../development/libraries/phonon {};
phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
@ -8575,7 +8575,7 @@ in
openbr = callPackage ../development/libraries/openbr { };
phonon = callPackage ../development/libraries/phonon/qt5 { };
phonon = callPackage ../development/libraries/phonon { };
phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };