libfive: 2018-07-01 -> 2020-02-15
Use proper Qt bindings (#65399). Note, current version didn't work for me, new version does. The libfive library is licensed under MPL 2.0, while the libfive-guile and libfive-studio are under GPL 2+ Superseeds #66128
This commit is contained in:
parent
05bcfa1820
commit
1e463bd602
2 changed files with 27 additions and 16 deletions
|
@ -1,30 +1,41 @@
|
|||
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen,
|
||||
zlib, libpng, boost, qt5, guile
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, wrapQtAppsHook
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
, pkgconfig
|
||||
, eigen
|
||||
, zlib
|
||||
, libpng
|
||||
, boost
|
||||
, guile
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "libfive";
|
||||
version = "2018-07-01";
|
||||
mkDerivation {
|
||||
pname = "libfive-unstable";
|
||||
version = "2020-02-15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libfive";
|
||||
repo = "libfive";
|
||||
rev = "0f517dde9521d751310a22f85ee69b2c84690267";
|
||||
sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0";
|
||||
owner = "libfive";
|
||||
repo = "libfive";
|
||||
rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd";
|
||||
sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
|
||||
};
|
||||
nativeBuildInputs = [ cmake ninja pkgconfig ];
|
||||
buildInputs = [ eigen zlib libpng boost qt5.qtimageformats guile ];
|
||||
|
||||
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkgconfig ];
|
||||
buildInputs = [ eigen zlib libpng boost guile ];
|
||||
|
||||
# Link "Studio" binary to "libfive-studio" to be more obvious:
|
||||
postFixup = ''
|
||||
ln -s "$out/bin/Studio" "$out/bin/libfive-studio"
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
|
||||
homepage = "https://libfive.com/";
|
||||
maintainers = with maintainers; [ hodapp ];
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ hodapp kovirobi ];
|
||||
license = with licenses; [ mpl20 gpl2Plus ];
|
||||
platforms = with platforms; linux ++ darwin;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -12802,7 +12802,7 @@ in
|
|||
|
||||
libfabric = callPackage ../os-specific/linux/libfabric {};
|
||||
|
||||
libfive = callPackage ../development/libraries/libfive { };
|
||||
libfive = libsForQt5.callPackage ../development/libraries/libfive { };
|
||||
|
||||
libfixposix = callPackage ../development/libraries/libfixposix {};
|
||||
|
||||
|
|
Loading…
Reference in a new issue