From 3fe3a4a47a3a55be4795e0513937ee27f7fc998f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 6 Oct 2025 12:17:13 +0000 Subject: [PATCH] openmvg: move to by-name --- .../openmvg/default.nix => by-name/op/openmvg/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{applications/science/misc/openmvg/default.nix => by-name/op/openmvg/package.nix} (98%) diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/by-name/op/openmvg/package.nix similarity index 98% rename from pkgs/applications/science/misc/openmvg/default.nix rename to pkgs/by-name/op/openmvg/package.nix index 8f757c3ae865..c4cf862a4730 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/by-name/op/openmvg/package.nix @@ -14,7 +14,7 @@ libpng, libtiff, nix-update-script, - openmp, + llvmPackages, osi, zlib, enableShared ? !stdenv.hostPlatform.isStatic, @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff - openmp + llvmPackages.openmp osi zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61842614a10b..764e7985b0ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3636,10 +3636,6 @@ with pkgs; openhantek6022 = libsForQt5.callPackage ../applications/science/electronics/openhantek6022 { }; - openmvg = callPackage ../applications/science/misc/openmvg { - inherit (llvmPackages) openmp; - }; - openmvs = callPackage ../applications/science/misc/openmvs { inherit (llvmPackages) openmp; };