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

telepathy-qt: minor update, fix by patch, unify

Browse Source 
- The patch fixes building against gst-1.6.
- Having to change three files with almost same contents would drive me mad,
  so I unified them into a single expression. /cc @ttuegel
- libxslt seemed unneeded, and it uses libxml2 anyway.
This commit is contained in:
Vladimír Čunát 2015-12-18 10:51:27 +01:00
parent be6c625410
commit 1932d101e2
4 changed files with 17 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -1,19 +1,27 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus }:
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, dbus_glib, dbus_daemon
, telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }:
stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.5";
name = "telepathy-qt-0.9.6";
src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
sha256 = "13lwh23ad9bg7hx1mj4xjc2lb8nlaaw8hbrmx5gg8nz5xxc4hiwk";
sha256 = "0j7hs055cx5g9chn3b2p0arig70m5g9547qgqvk29kxdyxxxsmqc";
};
patches = [(fetchpatch {
name = "gst-1.6.patch";
url = "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch"
+ "/?id=ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
})];
nativeBuildInputs = [ cmake pkgconfig python libxslt ];
propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
nativeBuildInputs = [ cmake pkgconfig python ];
propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
buildInputs = stdenv.lib.optional doCheck dbus_daemon;
cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}";
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';

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

@ -1,29 +0,0 @@
{ stdenv, fetchurl, cmake, qtbase, 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 = [ qtbase 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;
};
}

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

@ -1,29 +0,0 @@
{ 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;
};
}

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

@ -8190,7 +8190,7 @@ let
signon = callPackage ../development/libraries/signon { };
telepathy = callPackage ../development/libraries/telepathy/qt5 { };
telepathy = callPackage ../development/libraries/telepathy/qt { };
vlc = callPackage ../applications/video/vlc {
qt4 = null;
@ -8503,9 +8503,9 @@ let
telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
telepathy_qt = callPackage ../development/libraries/telepathy/qt { qtbase = qt4; };
telepathy_qt5 = callPackage ../development/libraries/telepathy/qt5/old.nix {};
telepathy_qt5 = telepathy_qt.override { qtbase = qt5.base; };
tevent = callPackage ../development/libraries/tevent {
python = python2;