dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #83711 from KoviRobi/libfive-2020-02-15

Browse Source 
libfive: 2018-07-01 -> 2020-02-15
This commit is contained in:
Sarah Brofeldt 2020-05-14 21:16:26 +02:00 committed by GitHub
commit 7625e2771f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/development/libraries/libfive/default.nix
View File

@ -1,30 +1,41 @@
{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, eigen, { lib
zlib, libpng, boost, qt5, guile , mkDerivation
, wrapQtAppsHook
, fetchFromGitHub
, cmake
, ninja
, pkgconfig
, eigen
, zlib
, libpng
, boost
, guile
}: }:
stdenv.mkDerivation { mkDerivation {
pname = "libfive"; pname = "libfive-unstable";
version = "2018-07-01"; version = "2020-02-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libfive"; owner = "libfive";
repo = "libfive"; repo = "libfive";
rev = "0f517dde9521d751310a22f85ee69b2c84690267"; rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd";
sha256 = "0bfxysf5f4ripgcv546il8wnw5p0d4s75kdjlwvj32549537hlz0"; 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: # Link "Studio" binary to "libfive-studio" to be more obvious:
postFixup = '' postFixup = ''
ln -s "$out/bin/Studio" "$out/bin/libfive-studio" 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"; description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile";
homepage = "https://libfive.com/"; homepage = "https://libfive.com/";
maintainers = with maintainers; [ hodapp ]; maintainers = with maintainers; [ hodapp kovirobi ];
license = licenses.lgpl2; license = with licenses; [ mpl20 gpl2Plus ];
platforms = platforms.linux; platforms = with platforms; linux ++ darwin;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -12864,7 +12864,7 @@ in
libfabric = callPackage ../os-specific/linux/libfabric {}; libfabric = callPackage ../os-specific/linux/libfabric {};
libfive = callPackage ../development/libraries/libfive { }; libfive = libsForQt5.callPackage ../development/libraries/libfive { };
libfixposix = callPackage ../development/libraries/libfixposix {}; libfixposix = callPackage ../development/libraries/libfixposix {};