svn merge ^/nixpkgs/trunk

Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863

2 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 7d04d9e9fec71..66dbddece3ccc 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 4574b5a9b3548..c7cee2f2c6659 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'';