From 8229dc4357f58cf8dc334d9394c22769480e5ced Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 21 Feb 2012 13:52:32 +0000 Subject: Trying to fix soqt for qt-4.8 svn path=/nixpkgs/trunk/; revision=32454 --- pkgs/development/libraries/soqt/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index f5a7724c506..60b148f870e 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, coin3d, qt4 }: +{ fetchurl, stdenv, coin3d, qt4, pkgconfig }: stdenv.mkDerivation rec { name = "soqt-${version}"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ coin3d qt4 ]; + buildNativeInputs = [ pkgconfig ]; + meta = { homepage = http://www.coin3d.org/; license = "GPLv2+"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8936f6fd700..2d14d943567 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4631,6 +4631,8 @@ let qt4 = qt47; }; + soqtQt48 = soqt.override { qt4 = qt48; }; + speechd = callPackage ../development/libraries/speechd { }; speech_tools = callPackage ../development/libraries/speech-tools {}; -- cgit 1.4.1