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

libsForQt5.qmltermwidget: fix build

Browse Source
This commit is contained in:
Robin Gloster 2017-03-02 14:13:02 +01:00
parent d9b9f956c3
commit c1866cade9
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/misc/gplates/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
, proj, boost160, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec {
name = "gplates-${version}";
@ -13,7 +14,10 @@ stdenv.mkDerivation rec {
./boostfix.patch
];
buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
buildInputs = [
qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost160 cmake python2
doxygen graphviz gmp
];
meta = with stdenv.lib; {
description = "Desktop software for the interactive visualisation of plate-tectonics";

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

@ -1,4 +1,4 @@
{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }:
{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:
stdenv.mkDerivation rec {
version = "0.1.0";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
};
buildInputs = [ qtbase qtquick1 ];
buildInputs = [ qtbase qtquick1 qtmultimedia ];
nativeBuildInputs = [ qmakeHook ];
patchPhase = ''