Author: urkud
Date: Fri Mar 30 09:03:35 2012
New Revision: 33488
URL: https://nixos.org/websvn/nix/?rev=33488&sc=1
Log:
telepathy-qt: farsight -> farstream
Deleted:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/telepathy/qt/missing-include.patch
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/telepathy/qt/default.nix
Modified:
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/telepathy/qt/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/telepathy/qt/default.nix
Fri Mar 30 08:27:56 2012 (r33487)
+++
nixpkgs/branches/glib-2.30-take2/pkgs/development/libraries/telepathy/qt/default.nix
Fri Mar 30 09:03:35 2012 (r33488)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
-, telepathy_farsight, telepathy_glib }:
+, telepathy_farstream, telepathy_glib }:
stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.1";
@@ -10,11 +10,8 @@
};
buildNativeInputs = [ cmake pkgconfig python libxslt ];
- propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ];
-
- patches = [ ./missing-include.patch ];
-
+ propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ];
preBuild = ''
- NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`"
- '';
+ NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
+ '';
}
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
