Explicit pkgs.prefix

svn path=/nixpkgs/trunk/; revision=23329
This commit is contained in:
Yury G. Kudryashov
2010-08-21 19:27:31 +00:00
parent c3948239d7
commit 608cde4f82
4 changed files with 29 additions and 39 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt47, automoc4,
{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4,
perl }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
# TODO: xfs.h
buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt47 automoc4 perl ];
buildInputs = [ cmake kdelibs gmp qca2 boost gettext qt4 automoc4 perl ];
meta = {
description = "A bittorrent library used in ktorrent";

View File

@@ -1,8 +1,9 @@
{ stdenv, fetchurl, qt47, vlc, automoc4, cmake }:
a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }:
let
pn = "phonon-backend-vlc";
v = "0.2.0";
vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version
in
stdenv.mkDerivation {
@@ -13,11 +14,11 @@ stdenv.mkDerivation {
sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv";
};
buildInputs = [ qt47 vlc cmake automoc4 ];
buildInputs = [ qt4 vlc cmake automoc4 phonon ];
meta = {
description = "VideoLAN backend for Phonon multimedia framework";
inherit (qt47.meta) platforms;
inherit (qt4.meta) platforms;
maintainers = [ stdenv.lib.maintainers.urkud ];
};
}