diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 22:44:52 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-14 22:44:52 +0000 |
| commit | fe1115caf48a467349127723a0e60b106433a076 (patch) | |
| tree | faf0e4045681f9afc916c5962cf8c52deb479f78 /pkgs/applications/networking/instant-messengers/psi/default.nix | |
| parent | 03875e0bce8ac31d54c6167eeba8cad11a8c22e0 (diff) | |
| download | nixlib-fe1115caf48a467349127723a0e60b106433a076.tar nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.gz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.bz2 nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.lz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.xz nixlib-fe1115caf48a467349127723a0e60b106433a076.tar.zst nixlib-fe1115caf48a467349127723a0e60b106433a076.zip | |
Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/psi/default.nix')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/psi/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 66dbddece3cc..2c6ba36c44f1 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, which, glib }: + libICE, qca2, pkgconfig, qca2_ossl, liboil, speex, callPackage, which, glib }: stdenv.mkDerivation rec { name = "psi-0.14"; @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { " --disable-bundled-qca" ]; - psiMedia = (import ./psimedia.nix) { - inherit stdenv fetchurl qt4 speex gst_all liboil which glib pkgconfig; - }; + psiMedia = callPackage ./psimedia.nix { }; postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" |