From 2950c57a65e414707e59bd95777aecf3b9e34886 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 15 Jun 2019 18:44:05 +0200 Subject: [PATCH] soqt: 1.5.0 -> 1.6.0a --- pkgs/development/libraries/soqt/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 9769596621b1..98226ce20f4a 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,17 +1,19 @@ -{ fetchurl, stdenv, coin3d, qt4, pkgconfig }: +{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "soqt-${version}"; - version = "1.5.0"; + pname = "soqt"; + version = "1.6.0a"; - src = fetchurl { - url = "https://bitbucket.org/Coin3D/coin/downloads/SoQt-${version}.tar.gz"; - sha256 = "14dbh8ynzjcgwgxjc6530c5plji7vn62kbdf447w0dp53564p8zn"; + src = fetchhg { + url = "https://bitbucket.org/Coin3D/soqt"; + rev = "5f2afb4890e0059eb27e1671f980d10ebfb9e762"; + sha256 = "0j9lsci4cx95v16l0jaky0vzh4lbdliwz7wc17442ihjaqiqmv8m"; + fetchSubrepos = true; }; - buildInputs = [ coin3d qt4 ]; + buildInputs = [ coin3d qt5.qtbase ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = { homepage = https://bitbucket.org/Coin3D/coin/wiki/Home;