Unverified Commit 50071c61 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #247503 from wegank/libfive-bump 

libfive: unstable-2022-05-19 -> unstable-2023-06-07
parents 187aca8b 5925e79d

pkgs/development/libraries/libfive/default.nix

+23 −17
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, stdenv

, wrapQtAppsHook

, fetchFromGitHub

, cmake
@@ -10,27 +10,31 @@ 
, libpng

, boost

, guile

, stdenv

, qtbase

, darwin

}:



mkDerivation {

  pname = "libfive-unstable";

  version = "2022-05-19";

stdenv.mkDerivation {

  pname = "libfive";

  version = "unstable-2023-06-07";



  src = fetchFromGitHub {

    owner = "libfive";

    repo = "libfive";

    rev = "d83cc22709ff1f7c478be07ff2419e30e024834e";

    sha256 = "lNJg2LCpFcTewSA00s7omUtzhVxycAXvo6wEM/JjrN0=";

    rev = "c85ffe1ba1570c2551434c5bad731884aaf80598";

    hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc=";

  };



  nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config ];

  buildInputs = [ eigen zlib libpng boost guile ];

  buildInputs = [ eigen zlib libpng boost guile qtbase ]

    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Cocoa ];



  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/${guile.siteCcacheDir}\");"

      --replace '"libfive/bind/guile"' \

                '"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"' \

      --replace '(app_resource_dir + ":" + finder_build_dir).toLocal8Bit()' \

                '"libfive/bind/guile:${placeholder "out"}/${guile.siteCcacheDir}"'



    substituteInPlace libfive/bind/guile/CMakeLists.txt \

      --replace "LIBFIVE_FRAMEWORK_DIR=$<TARGET_FILE_DIR:libfive>" \
@@ -43,18 +47,20 @@ mkDerivation { 


  cmakeFlags = [

    "-DGUILE_CCACHE_DIR=${placeholder "out"}/${guile.siteCcacheDir}"

  ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") [

    # warning: 'aligned_alloc' is only available on macOS 10.15 or newer

    "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15"

  ];



  postInstall = if stdenv.isDarwin then ''

  postInstall = lib.optionalString stdenv.isDarwin ''

    # No rules to install the mac app, so do it manually.

    mkdir -p $out/Applications

    cp -r studio/Studio.app $out/Applications/Studio.app



    install_name_tool \

      -change libfive.dylib $out/lib/libfive.dylib \

      -change libfive-guile.dylib $out/lib/libfive-guile.dylib \

      $out/Applications/Studio.app/Contents/MacOS/Studio

  '' else ''

    install_name_tool -add_rpath $out/lib $out/Applications/Studio.app/Contents/MacOS/Studio



    makeWrapper $out/Applications/Studio.app/Contents/MacOS/Studio $out/bin/Studio

  '' + ''

    # Link "Studio" binary to "libfive-studio" to be more obvious:

    ln -s "$out/bin/Studio" "$out/bin/libfive-studio"

  '';
@@ -64,6 +70,6 @@ mkDerivation { 
    homepage = "https://libfive.com/";

    maintainers = with maintainers; [ hodapp kovirobi ];

    license = with licenses; [ mpl20 gpl2Plus ];

    platforms = with platforms; linux ++ darwin;

    platforms = with platforms; all;

  };

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -22583,7 +22583,7 @@ with pkgs; 














  libfabric = callPackage ../development/libraries/libfabric { };



























  libfive = libsForQt5.callPackage ../development/libraries/libfive { };













  libfive = qt6Packages.callPackage ../development/libraries/libfive { };





























  libfixposix = callPackage ../development/libraries/libfixposix { };