From 8f57530b0b43dd38fcb2e5f0b24d983d3df8d92d Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 4 Nov 2025 01:01:19 +0000 Subject: [PATCH] caneda: migrate to pkgs/by-name --- .../ca/caneda/package.nix} | 23 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 13 deletions(-) rename pkgs/{applications/science/electronics/caneda/default.nix => by-name/ca/caneda/package.nix} (79%) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/by-name/ca/caneda/package.nix similarity index 79% rename from pkgs/applications/science/electronics/caneda/default.nix rename to pkgs/by-name/ca/caneda/package.nix index d7ed930cc88b..284dd6e72fe8 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/by-name/ca/caneda/package.nix @@ -1,16 +1,13 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, fetchpatch, cmake, - qtbase, - qttools, - qtsvg, - qwt6_1, + libsForQt5, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "caneda"; version = "0.4.0"; @@ -28,12 +25,16 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.qt5.wrapQtAppsHook + ]; + buildInputs = [ - qtbase - qttools - qtsvg - qwt6_1 + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.qwt6_1 ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c55ef11199c..0966d484e378 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13800,8 +13800,6 @@ with pkgs; eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; - caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; - degate = libsForQt5.callPackage ../applications/science/electronics/degate { }; geda = callPackage ../applications/science/electronics/geda {