Author: urkud
Date: Tue Feb 21 13:52:32 2012
New Revision: 32454
URL: https://nixos.org/websvn/nix/?rev=32454&sc=1
Log:
Trying to fix soqt for qt-4.8
Modified:
nixpkgs/trunk/pkgs/development/libraries/soqt/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/soqt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/soqt/default.nix Tue Feb 21
13:39:29 2012 (r32453)
+++ nixpkgs/trunk/pkgs/development/libraries/soqt/default.nix Tue Feb 21
13:52:32 2012 (r32454)
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, coin3d, qt4 }:
+{ fetchurl, stdenv, coin3d, qt4, pkgconfig }:
stdenv.mkDerivation rec {
name = "soqt-${version}";
@@ -11,6 +11,8 @@
buildInputs = [ coin3d qt4 ];
+ buildNativeInputs = [ pkgconfig ];
+
meta = {
homepage = http://www.coin3d.org/;
license = "GPLv2+";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 13:39:29
2012 (r32453)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 13:52:32
2012 (r32454)
@@ -4631,6 +4631,8 @@
qt4 = qt47;
};
+ soqtQt48 = soqt.override { qt4 = qt48; };
+
speechd = callPackage ../development/libraries/speechd { };
speech_tools = callPackage ../development/libraries/speech-tools {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
