diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix deleted file mode 100644 index b99c2201ec09..000000000000 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - mkDerivation, - lib, - fetchFromGitHub, - cmake, - qtbase, - qttools, - qtsvg, - qwt6_1, -}: - -mkDerivation rec { - pname = "caneda"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "Caneda"; - repo = "Caneda"; - rev = version; - sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - qtbase - qttools - qtsvg - qwt6_1 - ]; - - meta = { - description = "Open source EDA software focused on easy of use and portability"; - mainProgram = "caneda"; - homepage = "http://caneda.org"; - license = lib.licenses.gpl2Plus; - maintainers = [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/by-name/ca/caneda/package.nix b/pkgs/by-name/ca/caneda/package.nix new file mode 100644 index 000000000000..4e157aa9ee5d --- /dev/null +++ b/pkgs/by-name/ca/caneda/package.nix @@ -0,0 +1,49 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchpatch, + cmake, + libsForQt5, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "caneda"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Caneda"; + repo = "Caneda"; + rev = finalAttrs.version; + sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ="; + }; + + patches = [ + (fetchpatch { + url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch"; + hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA="; + }) + ]; + + nativeBuildInputs = [ + cmake + libsForQt5.qt5.wrapQtAppsHook + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.qtsvg + libsForQt5.qwt6_1 + ]; + + meta = { + description = "Open source EDA software focused on easy of use and portability"; + changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}"; + mainProgram = "caneda"; + homepage = "http://caneda.org"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ magicquark ]; + platforms = with lib.platforms; linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aea5f48c6eec..06da39ea99f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13785,8 +13785,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 {