public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

State qt version (3/4) in packages, not in all-packages.nix

Browse Source 
svn path=/nixpkgs/trunk/; revision=31406
This commit is contained in:
Yury G. Kudryashov
2012-01-07 17:06:49 +00:00
parent d126fe5806
commit 7e320a7043
17 changed files with 53 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/arts/default.nix
View File

@@ -1,4 +1,5 @@
{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}:
{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
, libpng, perl, qt3}:
stdenv.mkDerivation {
name = "arts-1.5.10";
@@ -19,7 +20,10 @@ stdenv.mkDerivation {
--enable-final
'';
buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt];
buildNativeInputs = [ pkgconfig perl ];
buildInputs =
[glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
meta = {
homepage = http://www.arts-project.org/;

4
pkgs/development/libraries/mlt/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
libvorbis, sox}:
stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0";
};
buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
# Mostly taken from:
# http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine

2
pkgs/development/libraries/qt-3/default.nix
View File

@@ -5,7 +5,7 @@
, xineramaSupport ? true, libXinerama ? null
, cursorSupport ? true, libXcursor ? null
, threadSupport ? true
, mysqlSupport ? true, mysql ? null
, mysqlSupport ? false, mysql ? null
, openglSupport ? false, mesa ? null, libXmu ? null
, x11, xextproto, zlib, libjpeg, libpng, which
}: