diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2024-01-26 12:29:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-26 12:29:06 +0100 |
commit | e6a734b33dfb94d0a44bbaad60ee059383ef7276 (patch) | |
tree | 0416cd4949a77fa5d398c112b29a3a905fd8811e /pkgs/applications/graphics | |
parent | 10ed9173c50c3825077879887714c3aed10e141f (diff) | |
parent | d5e11b7d9a8303fe2e49e2ef042791e7db7ae823 (diff) | |
download | nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar.gz nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar.bz2 nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar.lz nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar.xz nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.tar.zst nixlib-e6a734b33dfb94d0a44bbaad60ee059383ef7276.zip |
Merge pull request #283052 from pbsds/fix-f3d-1705963389
f3d: 2.2.1 -> 2.3.0, unbreak
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/f3d/default.nix | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 90dc732c0306..2fef95222b5a 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, help2man +, gzip +, vtk_9 +, autoPatchelfHook +, libX11 +, libGL +, Cocoa +, OpenGL +}: stdenv.mkDerivation rec { pname = "f3d"; - version = "2.2.1"; + version = "2.3.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME="; + hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + help2man + gzip + # https://github.com/f3d-app/f3d/pull/1217 + autoPatchelfHook + ]; buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - # conflict between VTK and Nixpkgs; - # see https://github.com/NixOS/nixpkgs/issues/89167 cmakeFlags = [ + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + + "-DF3D_LINUX_GENERATE_MAN=ON" ]; meta = with lib; { @@ -28,11 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://f3d-app.github.io/f3d"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin pbsds ]; platforms = with platforms; unix; - # As of 2024-01-20, this fails with: - # error while loading shared libraries: libvtkInteractionWidgets.so.1: cannot open shared object file: No such file or directory - # Tracking issue: https://github.com/NixOS/nixpkgs/issues/262328 - broken = true; }; } |