diff options
| -rw-r--r-- | pkgs/applications/science/misc/tulip/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 1dfd47a3d38..87a05f146e9 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,19 +1,20 @@ -{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew, qt4 -, cmake, makeWrapper, libjpeg, python2 }: +{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew +, qtbase, wrapQtAppsHook, python3 +, cmake, libjpeg }: -let version = "5.2.1"; in stdenv.mkDerivation rec { pname = "tulip"; - inherit version; + version = "5.6.1"; src = fetchurl { url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; - sha256 = "0bqmqy6sri87a8xv5xf7ffaq5zin4hiaa13g0l64b84i7yckfwky"; + sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw"; }; - buildInputs = [ libxml2 freetype glew libGLU libGL qt4 libjpeg python2 ]; + buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; - nativeBuildInputs = [ cmake makeWrapper ]; + qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e9853a6702..3edef50f424 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32517,9 +32517,7 @@ with pkgs; astrolabe-generator = callPackage ../applications/science/astronomy/astrolabe-generator { }; - tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake_2_8; - }; + tulip = libsForQt5.callPackage ../applications/science/misc/tulip { }; vite = callPackage ../applications/science/misc/vite { }; |