From 39206f5b44616d64b7d67eb6f309bedd1c9c2cae Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Tue, 24 Jan 2012 00:00:34 +0000
Subject: Get psi to compile with kde47 and kde48.

svn path=/nixpkgs/trunk/; revision=31799
---
 pkgs/applications/networking/instant-messengers/psi/default.nix  | 6 +++---
 pkgs/applications/networking/instant-messengers/psi/psimedia.nix | 4 ++--
 pkgs/top-level/all-packages.nix                                  | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index b0819da4c6e52..b4c4c1f476f6c 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, 
-  libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all }:
+  libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, gst_all, which, glib }:
 
 stdenv.mkDerivation rec {
   name = "psi-0.14";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE 
-    qca2 qca2_ossl pkgconfig];
+    qca2 qca2_ossl pkgconfig which glib];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
   
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ];
 
   psiMedia = (import ./psimedia.nix) {
-    inherit stdenv fetchurl qt4 speex gst_all liboil;
+    inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
   };
 
   postInstall = ''
diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
index 5f6112b53d081..9b41d38d41239 100644
--- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, gst_all, liboil, speex}:
+{stdenv, fetchurl, qt4, gst_all, liboil, speex, which, glib, pkgconfig}:
 
 stdenv.mkDerivation rec {
   name = "psimedia";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
   };
 
-  buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex];
+  buildInputs = [qt4 gst_all.gstreamer gst_all.gstPluginsBase liboil speex which glib pkgconfig];
 
   configurePhase = ''./configure'';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40f386aea8388..b1569573b04a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8200,7 +8200,9 @@ let
 
       polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
 
-      psi = callPackage ../applications/networking/instant-messengers/psi { };
+      psi = callPackage ../applications/networking/instant-messengers/psi {
+        inherit (gtkLibs) glib;
+      };
 
       quassel = callPackage ../applications/networking/irc/quassel { };
 
-- 
cgit 1.4.1