nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

telepathy_qt5: build with Qt 5.5

Browse Source
This commit is contained in:
Thomas Tuegel 2015-09-27 10:24:55 -05:00
parent e462bdce89
commit 9e3b22d25a
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/telepathy/qt5/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus }:
stdenv.mkDerivation rec {
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ];

29
pkgs/development/libraries/telepathy/qt5/old.nix Normal file
View File

@ -0,0 +1,29 @@
{ stdenv, fetchurl, cmake, qt5, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus }:
stdenv.mkDerivation rec {
name = "telepathy-qt5-0.9.5";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
};
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt5.base dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
cmakeFlags = [ "-DDESIRED_QT_VERSION=5" ];
buildInputs = stdenv.lib.optional doCheck dbus_daemon;
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';
enableParallelBuilding = true;
doCheck = false; # giving up for now
meta = {
platforms = stdenv.lib.platforms.linux;
};
}

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

@ -7962,6 +7962,8 @@ let
signon = callPackage ../development/libraries/signon { };
telepathy = callPackage ../development/libraries/telepathy/qt5 { };
vlc = callPackage ../applications/video/vlc {
qt4 = null;
withQt5 = true;
@ -8267,7 +8269,7 @@ let
telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5 { };
telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {};
tevent = callPackage ../development/libraries/tevent {
python = python2;