diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-17 07:48:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-17 07:48:54 +0200 |
commit | 60fefd4cce4177a27237ba4850a06816f1608b00 (patch) | |
tree | 986936286805f082d77edf9fdebf7d244ba7ea93 | |
parent | f155c4d4fbdd33c0ed646abdd54716ac17c54149 (diff) | |
parent | 9f628e292e73099524ff3d3714879f9a55eb156c (diff) |
Merge pull request #261506 from wegank/tulip-bump
tulip: 5.6.1 -> 5.7.2
-rw-r--r-- | pkgs/applications/science/misc/tulip/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index a2d3f3d9a2aac..947cc2c7c3bbd 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,26 +1,32 @@ -{ fetchurl, lib, stdenv, libxml2, freetype, libGLU, libGL, glew -, qtbase, wrapQtAppsHook, python3 -, cmake, libjpeg }: +{ lib, stdenv, fetchurl, libxml2, freetype, libGLU, libGL, glew +, qtbase, wrapQtAppsHook, autoPatchelfHook, python3 +, cmake, libjpeg, llvmPackages }: stdenv.mkDerivation rec { pname = "tulip"; - version = "5.6.1"; + version = "5.7.2"; src = fetchurl { - url = "mirror://sourceforge/auber/${pname}-${version}_src.tar.gz"; - sha256 = "1fy3nvgxv3igwc1d23zailcgigj1d0f2kkh7a5j24c0dyqz5zxmw"; + url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz"; + hash = "sha256-b+XFCS6Ks+EpwxgYFzWdRomfCpHXmZHXnrQM+ZSLN/0="; }; - buildInputs = [ libxml2 freetype glew libGLU libGL libjpeg qtbase python3 ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + buildInputs = [ libxml2 freetype glew libjpeg qtbase python3 ] + ++ lib.optionals stdenv.isDarwin [ llvmPackages.openmp ] + ++ lib.optionals stdenv.isLinux [ libGLU libGL ]; qtWrapperArgs = [ ''--prefix PATH : ${lib.makeBinPath [ python3 ]}'' ]; + # error: format string is not a string literal (potentially insecure) + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-format-security"; + # FIXME: "make check" needs Docbook's DTD 4.4, among other things. doCheck = false; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "A visualization framework for the analysis and visualization of relational data"; longDescription = @@ -36,6 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = [ ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice + platforms = lib.platforms.all; }; } |