libfive-unstable: 2020-02-15 -> 2022-05-19

+23 -6
+23 -6
pkgs/development/libraries/libfive/default.nix
··· 9 9 , zlib 10 10 , libpng 11 11 , boost 12 - , guile 12 + , guile_3_0 13 13 , stdenv 14 14 }: 15 15 16 16 mkDerivation { 17 17 pname = "libfive-unstable"; 18 - version = "2020-02-15"; 18 + version = "2022-05-19"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "libfive"; 22 22 repo = "libfive"; 23 - rev = "5b7717a25064478cd6bdb190683566eaf4c7afdd"; 24 - sha256 = "102zw2n3vzv84i323is4qrwwqqha8v1cniw54ss8f4bq6dmic0bg"; 23 + rev = "d83cc22709ff1f7c478be07ff2419e30e024834e"; 24 + sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0="; 25 25 }; 26 26 27 27 nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ]; 28 - buildInputs = [ eigen zlib libpng boost guile ]; 28 + buildInputs = [ eigen zlib libpng boost guile_3_0 ]; 29 + 30 + preConfigure = '' 31 + substituteInPlace studio/src/guile/interpreter.cpp \ 32 + --replace "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile\");" \ 33 + "qputenv(\"GUILE_LOAD_COMPILED_PATH\", \"libfive/bind/guile:$out/lib/guile/3.0/ccache\");" 34 + 35 + substituteInPlace libfive/bind/guile/CMakeLists.txt \ 36 + --replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \ 37 + "LIBFIVE_FRAMEWORK_DIR=$out/lib" \ 38 + --replace "LIBFIVE_STDLIB_DIR=$<TARGET_FILE_DIR:libfive-stdlib>" \ 39 + "LIBFIVE_STDLIB_DIR=$out/lib" 40 + 41 + export XDG_CACHE_HOME=$(mktemp -d)/.cache 42 + ''; 43 + 44 + cmakeFlags = [ 45 + "-DGUILE_CCACHE_DIR=${placeholder "out"}/lib/guile/3.0/ccache" 46 + ]; 29 47 30 48 postInstall = if stdenv.isDarwin then '' 31 49 # No rules to install the mac app, so do it manually. ··· 47 65 maintainers = with maintainers; [ hodapp kovirobi ]; 48 66 license = with licenses; [ mpl20 gpl2Plus ]; 49 67 platforms = with platforms; linux ++ darwin; 50 - broken = true; 51 68 }; 52 69 }