Author: kkallio
Date: Tue Jan 24 00:00:34 2012
New Revision: 31799
URL: https://nixos.org/websvn/nix/?rev=31799&sc=1
Log:
Get psi to compile with kde47 and kde48.
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/default.nix
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/default.nix
Mon Jan 23 21:56:33 2012 (r31798)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/default.nix
Tue Jan 24 00:00:34 2012 (r31799)
@@ -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 @@
};
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 @@
];
psiMedia = (import ./psimedia.nix) {
- inherit stdenv fetchurl qt4 speex gst_all liboil;
+ inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig;
};
postInstall = ''
Modified:
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
Mon Jan 23 21:56:33 2012 (r31798)
+++
nixpkgs/trunk/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
Tue Jan 24 00:00:34 2012 (r31799)
@@ -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 @@
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'';
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Jan 23 21:56:33
2012 (r31798)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jan 24 00:00:34
2012 (r31799)
@@ -8200,7 +8200,9 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
