From f3ceed11e1e3dad34b75691804c673890bd67a1a Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Sat, 14 Feb 2026 03:16:06 -0500 Subject: [PATCH] libfive: migrate to by-name --- .../libfive/default.nix => by-name/li/libfive/package.nix} | 7 +++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) rename pkgs/{development/libraries/libfive/default.nix => by-name/li/libfive/package.nix} (98%) diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/by-name/li/libfive/package.nix similarity index 98% rename from pkgs/development/libraries/libfive/default.nix rename to pkgs/by-name/li/libfive/package.nix index 6093bb8e1b5e..871cb2389a56 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/by-name/li/libfive/package.nix @@ -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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb7b195c2e66..e7a81438158e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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). #