diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-19 19:22:30 +0000 |
| commit | 6c3ffdc228a9808c65a0205cd1fd404578d02dee (patch) | |
| tree | c5998bfbac1bc92dace314e051164f830976d661 /nixpkgs/pkgs/development/libraries/soqt/default.nix | |
| parent | ef93931efff0323fd13c4270415b578c73b5ef35 (diff) | |
| parent | 83ba5afcc9682b52b39a9a958f730b966cc369c5 (diff) | |
| download | nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.gz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.bz2 nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.lz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.xz nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.tar.zst nixlib-6c3ffdc228a9808c65a0205cd1fd404578d02dee.zip | |
Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/soqt/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/soqt/default.nix | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/development/libraries/soqt/default.nix b/nixpkgs/pkgs/development/libraries/soqt/default.nix index 9769596621b1..98226ce20f4a 100644 --- a/nixpkgs/pkgs/development/libraries/soqt/default.nix +++ b/nixpkgs/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; |