diff options
| author | Robin Gloster <mail@glob.in> | 2017-03-02 14:13:02 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-03-02 14:13:35 +0100 |
| commit | c1866cade9bce6fefa209095055248302ef6ad9d (patch) | |
| tree | 1d65f999b31c9d719677e481ffeda1d01b21b599 | |
| parent | d9b9f956c3818e349b02e3bde861b45f068b2e16 (diff) | |
| download | nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar.gz nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar.bz2 nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar.lz nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar.xz nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.tar.zst nixpkgs-c1866cade9bce6fefa209095055248302ef6ad9d.zip | |
libsForQt5.qmltermwidget: fix build
| -rw-r--r-- | pkgs/applications/science/misc/gplates/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/qmltermwidget/default.nix | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 9dd7b6b72db..bc5b8060e23 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -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"; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index c4bb36209d9..bb058711b2e 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -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 = '' |