Skip to content

Commit

Permalink
libsForQt5.qmltermwidget: fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
globin committed Mar 2, 2017
1 parent d9b9f95 commit c1866ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions pkgs/applications/science/misc/gplates/default.nix
Original file line number Diff line number Diff line change
@@ -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}";
Expand All @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qmltermwidget/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }:
{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:

stdenv.mkDerivation rec {
version = "0.1.0";
Expand All @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
};

buildInputs = [ qtbase qtquick1 ];
buildInputs = [ qtbase qtquick1 qtmultimedia ];
nativeBuildInputs = [ qmakeHook ];

patchPhase = ''
Expand Down

0 comments on commit c1866ca

Please sign in to comment.