forked from mirrors/nixpkgs
f3d: 1.2.1 -> 1.3.1
This commit is contained in:
parent
092d8e3d4e
commit
aca609f053
|
@ -2,13 +2,13 @@
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "f3d";
|
pname = "f3d";
|
||||||
version = "1.2.1";
|
version = "1.3.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "f3d-app";
|
owner = "f3d-app";
|
||||||
repo = "f3d";
|
repo = "f3d";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U=";
|
hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals stdenv.isLinux [ libGL libX11 ]
|
++ lib.optionals stdenv.isLinux [ libGL libX11 ]
|
||||||
++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
|
++ 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; {
|
meta = with lib; {
|
||||||
description = "Fast and minimalist 3D viewer using VTK";
|
description = "Fast and minimalist 3D viewer using VTK";
|
||||||
homepage = "https://f3d-app.github.io/f3d";
|
homepage = "https://f3d-app.github.io/f3d";
|
||||||
|
|
Loading…
Reference in a new issue