diff options
author | Ben Darwin <bcdarwin@gmail.com> | 2022-09-13 14:56:00 -0400 |
---|---|---|
committer | Ben Darwin <bcdarwin@gmail.com> | 2022-09-13 14:56:00 -0400 |
commit | aca609f0537d2b5aae212dc1a703bf1ad257ac23 (patch) | |
tree | 7154dcfe8af2d57c1d1f9bc72fffb8415047d77a /pkgs/applications/graphics | |
parent | 092d8e3d4ea7ae8c710be956ef68e1f880dfacd8 (diff) |
f3d: 1.2.1 -> 1.3.1
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/f3d/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 9e3374064e6e5..42671599a643c 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U="; + hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q="; }; nativeBuildInputs = [ cmake ]; @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ libGL libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + ]; + meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; homepage = "https://f3d-app.github.io/f3d"; |