BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #196828 from KoviRobi/update-libfive-unstable-2022-05-19

Browse source 
libfive-unstable: 2020-02-15 -> 2022-05-19
This commit is contained in:
Robert Scott 2022-10-22 11:32:10 +01:00 committed by GitHub
commit e27f3b75ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkgs/development/libraries/libfive/default.nix
View file

@ -9,23 +9,41 @@
, zlib
, libpng
, boost
, guile
, guile_3_0
, stdenv
}:
mkDerivation {
pname = "libfive-unstable";
version = "2020-02-15";
version = "2022-05-19";
src = fetchFromGitHub {
owner = "libfive";
repo = "libfive";
rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd";
sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg";
rev = "d83cc22709ff1f7c478be07ff2419e30e024834e";
sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0=";
};
nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];
buildInputs = [ eigen zlib libpng boost guile ];
buildInputs = [ eigen zlib libpng boost guile_3_0 ];
preConfigure = ''
substituteInPlace studio/src/guile/interpreter.cpp \
--replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \
"qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/lib/guile/3.0/ccache\");"
substituteInPlace libfive/bind/guile/CMakeLists.txt \
--replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \
"LIBFIVE_FRAMEWORK_DIR=$out/lib" \
--replace "LIBFIVE_STDLIB_DIR=$<TARGET_FILE_DIR:libfive-stdlib>" \
"LIBFIVE_STDLIB_DIR=$out/lib"
export XDG_CACHE_HOME=$(mktemp -d)/.cache
'';
cmakeFlags = [
"-DGUILE_CCACHE_DIR=${placeholder "out"}/lib/guile/3.0/ccache"
];
postInstall = if stdenv.isDarwin then ''
# No rules to install the mac app, so do it manually.
@ -47,6 +65,5 @@ mkDerivation {
maintainers = with maintainers; [ hodapp kovirobi ];
license = with licenses; [ mpl20 gpl2Plus ];
platforms = with platforms; linux ++ darwin;
broken = true;
};
}