libfive: migrate to by-name
This commit is contained in:
+3
-4
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
wrapQtAppsHook,
|
||||
fetchFromGitHub,
|
||||
unstableGitUpdater,
|
||||
cmake,
|
||||
@@ -13,7 +12,7 @@
|
||||
boost,
|
||||
guile,
|
||||
python3,
|
||||
qtbase,
|
||||
libsForQt5,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
@@ -28,7 +27,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
libsForQt5.wrapQtAppsHook
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
@@ -41,7 +40,7 @@ stdenv.mkDerivation {
|
||||
boost
|
||||
guile
|
||||
python3
|
||||
qtbase
|
||||
libsForQt5.qtbase
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
@@ -6856,8 +6856,6 @@ with pkgs;
|
||||
extraOnly = true;
|
||||
};
|
||||
|
||||
libfive = libsForQt5.callPackage ../development/libraries/libfive { };
|
||||
|
||||
# Use Apple’s fork of libffi by default, which provides APIs and trampoline functionality that is not yet
|
||||
# merged upstream. This is needed by some packages (such as cffi).
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user