From 7f44f8f1c52dbf8808539bc75abc8c49ab09eb28 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Thu, 26 Jun 2025 18:33:34 -0700 Subject: [PATCH] antimony: move to by-name --- .../graphics => by-name/an}/antimony/mimetype.xml | 0 .../an/antimony/package.nix} | 15 +++++++-------- .../an}/antimony/paths-fix.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/{applications/graphics => by-name/an}/antimony/mimetype.xml (100%) rename pkgs/{applications/graphics/antimony/default.nix => by-name/an/antimony/package.nix} (90%) rename pkgs/{applications/graphics => by-name/an}/antimony/paths-fix.patch (100%) diff --git a/pkgs/applications/graphics/antimony/mimetype.xml b/pkgs/by-name/an/antimony/mimetype.xml similarity index 100% rename from pkgs/applications/graphics/antimony/mimetype.xml rename to pkgs/by-name/an/antimony/mimetype.xml diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/by-name/an/antimony/package.nix similarity index 90% rename from pkgs/applications/graphics/antimony/default.nix rename to pkgs/by-name/an/antimony/package.nix index 4078f09d24ee..05c29ae9e698 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/by-name/an/antimony/package.nix @@ -6,8 +6,7 @@ python3, libGLU, libGL, - qtbase, - wrapQtAppsHook, + libsForQt5, ncurses, cmake, flex, @@ -51,7 +50,7 @@ stdenv.mkDerivation { python3.pkgs.boost libGLU libGL - qtbase + libsForQt5.qtbase ncurses ]; @@ -59,7 +58,7 @@ stdenv.mkDerivation { cmake flex lemon - wrapQtAppsHook + libsForQt5.wrapQtAppsHook copyDesktopItems ]; @@ -90,12 +89,12 @@ stdenv.mkDerivation { "-DGITBRANCH=${gitBranch}" ]; - meta = with lib; { + meta = { description = "Computer-aided design (CAD) tool from a parallel universe"; mainProgram = "antimony"; homepage = "https://github.com/mkeeter/antimony"; - license = licenses.mit; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rnhmjoj ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/pkgs/by-name/an/antimony/paths-fix.patch similarity index 100% rename from pkgs/applications/graphics/antimony/paths-fix.patch rename to pkgs/by-name/an/antimony/paths-fix.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09a5540fec3f..c9634dcb0544 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11830,8 +11830,6 @@ with pkgs; ); android-studio-for-platform = androidStudioForPlatformPackages.stable; - antimony = libsForQt5.callPackage ../applications/graphics/antimony { }; - apngasm = callPackage ../applications/graphics/apngasm { }; apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { };