diff --git a/pkgs/applications/misc/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix similarity index 96% rename from pkgs/applications/misc/coreaction/default.nix rename to pkgs/applications/misc/cubocore-packages/coreaction/default.nix index be9d02bf339..f17730cc7e9 100644 --- a/pkgs/applications/misc/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, libcsys, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, fetchpatch, qtsvg, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreaction"; @@ -27,8 +27,8 @@ mkDerivation rec { buildInputs = [ qtsvg qtbase - libcsys libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/tools/archivers/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix similarity index 92% rename from pkgs/tools/archivers/corearchiver/default.nix rename to pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 217520dde99..56a05bc434e 100644 --- a/pkgs/tools/archivers/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corearchiver"; @@ -18,9 +18,10 @@ mkDerivation rec { buildInputs = [ qtbase - libcprime libarchive-qt libarchive + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix similarity index 88% rename from pkgs/applications/misc/corefm/default.nix rename to pkgs/applications/misc/cubocore-packages/corefm/default.nix index 9ad99e3aa06..3ec918db7af 100644 --- a/pkgs/applications/misc/corefm/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, libcsys, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corefm"; diff --git a/pkgs/applications/misc/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix similarity index 92% rename from pkgs/applications/misc/coregarage/default.nix rename to pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 6d665479764..719047c8de7 100644 --- a/pkgs/applications/misc/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, libarchive, libarchive-qt, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coregarage"; @@ -18,9 +18,10 @@ mkDerivation rec { buildInputs = [ qtbase - libcprime libarchive libarchive-qt + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix similarity index 86% rename from pkgs/applications/misc/corehunt/default.nix rename to pkgs/applications/misc/cubocore-packages/corehunt/default.nix index ad1fabb2504..fb9bcd5e8ef 100644 --- a/pkgs/applications/misc/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "corehunt"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/graphics/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix similarity index 86% rename from pkgs/applications/graphics/coreimage/default.nix rename to pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 1dcff1f6e8f..224c946d117 100644 --- a/pkgs/applications/graphics/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, qtbase, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreimage"; @@ -19,6 +19,7 @@ mkDerivation rec { buildInputs = [ qtbase libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix new file mode 100644 index 00000000000..d8df86abd87 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, libzen, libmediainfo, zlib, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreinfo"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-kLBOvvulHE1+4TyZVEVZwEA+Id7+w8fI3ll+QL2ukr0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libzen + libmediainfo + zlib + libcprime + libcsys + ]; + + meta = with lib; { + description = "A file information tool from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreinfo"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix new file mode 100644 index 00000000000..3d4e6ddc301 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corekeyboard"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0CbQ43BN4ORvtxs6FwNkgk/0jcVdFJq/tqvjUGYanM4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + xorg.libXtst + xorg.libX11 + libcprime + libcsys + ]; + + meta = with lib; { + description = "A virtual keyboard for X11 from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix new file mode 100644 index 00000000000..fcd1bfa4a4f --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepad"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2bGHVv0+0NlkIqnvWm014Kr20uARWnOS5xSuNmCt/bQ="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A document editor from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepad"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix new file mode 100644 index 00000000000..6410da3ba60 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepaint"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nATraYm7FZEXoNWgXt1G86KdrAvRgM358F+YdfWcnkg="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A paint app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepaint"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix new file mode 100644 index 00000000000..bb93391c2af --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, poppler, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepdf"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HeOklgCwJ5h3DeelJOZqasG+eC9DGG3R0Cqg2yPKYhM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + poppler + libcprime + libcsys + ]; + + meta = with lib; { + description = "A PDF viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepdf"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix new file mode 100644 index 00000000000..80d3a096ffe --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corepins"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-H/l/MHHrTmkfznVKUHFAhim8b/arT5SNK5fxTvjsTE4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A bookmarking app from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corepins"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix new file mode 100644 index 00000000000..f92d532ba4a --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corerenamer"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-OI7M7vV0CA42J5cWCqgGKEzUUHSgIJCWRTXmKRD6Jb0="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "A batch file renamer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corerenamer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix similarity index 85% rename from pkgs/tools/misc/coreshot/default.nix rename to pkgs/applications/misc/cubocore-packages/coreshot/default.nix index bb2404b1ed5..bf9f5e49aea 100644 --- a/pkgs/tools/misc/coreshot/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, libcprime, cmake, ninja }: +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, cmake, ninja, libcprime, libcsys }: mkDerivation rec { pname = "coreshot"; @@ -20,6 +20,7 @@ mkDerivation rec { qtbase qtx11extras libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix new file mode 100644 index 00000000000..a6d71eaa6cb --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, lm_sensors, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestats"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/WBetvbd8e4v+j6e2xbGtSLwNMdLlaahSIks6r889B4="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + lm_sensors + libcprime + libcsys + ]; + + meta = with lib; { + description = "A system resource viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestats"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix new file mode 100644 index 00000000000..57216f4710d --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -0,0 +1,35 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtx11extras, kglobalaccel, xorg, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "corestuff"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/mmCIHZXn/Jpjr37neI6owWuU1VO6o7wmRj6ZH8tUbo="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtx11extras + kglobalaccel + xorg.libXcomposite + libcprime + libcsys + ]; + + meta = with lib; { + description = "An activity viewer from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/corestuff"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/terminal-emulators/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix similarity index 97% rename from pkgs/applications/terminal-emulators/coreterminal/default.nix rename to pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index e358fae0716..c2085686aab 100644 --- a/pkgs/applications/terminal-emulators/coreterminal/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -1,12 +1,13 @@ { mkDerivation , lib , fetchFromGitLab -, cmake -, ninja , qtbase , qtserialport , qtermwidget +, cmake +, ninja , libcprime +, libcsys }: mkDerivation rec { @@ -30,6 +31,7 @@ mkDerivation rec { qtserialport qtermwidget libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix new file mode 100644 index 00000000000..af33d474e35 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -0,0 +1,33 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, qtmultimedia, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coretime"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b7oqHhsuHsy96IAXPUtw+WqneEHgn/nUDgHiJt2aXXM="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + qtmultimedia + libcprime + libcsys + ]; + + meta = with lib; { + description = "A time related task manager from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coretime"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch similarity index 100% rename from pkgs/applications/misc/coretoppings/0001-fix-install-phase.patch rename to pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch diff --git a/pkgs/applications/misc/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix similarity index 76% rename from pkgs/applications/misc/coretoppings/default.nix rename to pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index eff253ffcc2..154f4a38994 100644 --- a/pkgs/applications/misc/coretoppings/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -1,8 +1,32 @@ -{ mkDerivation, lib, fetchFromGitLab, libcprime, cmake, ninja -, ffmpeg, qtbase, qtx11extras, qtconnectivity, v4l-utils, grim, wf-recorder -, libdbusmenu, playerctl, xorg, iio-sensor-proxy, inotify-tools -, bluez, networkmanager, connman, redshift, gawk -, polkit, libnotify, systemd, xdg-utils }: +{ mkDerivation +, lib +, fetchFromGitLab +, ffmpeg +, cmake +, ninja +, qtbase +, qtx11extras +, qtconnectivity +, v4l-utils +, grim +, wf-recorder +, libdbusmenu +, playerctl +, xorg +, iio-sensor-proxy +, inotify-tools +, bluez +, networkmanager +, connman +, redshift +, gawk +, polkit +, libnotify +, systemd +, xdg-utils +, libcprime +, libcsys +}: mkDerivation rec { pname = "coretoppings"; @@ -15,22 +39,21 @@ mkDerivation rec { sha256 = "sha256-DpmzGqjW1swLirRLzd5nblAb40LHAmf8nL+VykQNL3E="; }; - nativeBuildInputs = [ - cmake - ninja - ]; - patches = [ # Fix file cannot create directory: /var/empty/share/polkit-1/actions ./0001-fix-install-phase.patch ]; + nativeBuildInputs = [ + cmake + ninja + ]; + buildInputs = [ qtbase qtx11extras qtconnectivity libdbusmenu - libcprime ffmpeg v4l-utils grim @@ -50,6 +73,8 @@ mkDerivation rec { libnotify systemd xdg-utils + libcprime + libcsys ]; meta = with lib; { diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix new file mode 100644 index 00000000000..0a6ccaf7214 --- /dev/null +++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -0,0 +1,32 @@ +{ mkDerivation, lib, fetchFromGitLab, qtbase, cmake, ninja, libcprime, libcsys }: + +mkDerivation rec { + pname = "coreuniverse"; + version = "4.2.0"; + + src = fetchFromGitLab { + owner = "cubocore/coreapps"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YZCMyYMAvd/xQYNUnURIvmQwaM+X+Ql93OS4ZIyAZLY="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + qtbase + libcprime + libcsys + ]; + + meta = with lib; { + description = "Shows information about apps from the C Suite"; + homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch similarity index 100% rename from pkgs/development/libraries/libcprime/0001-fix-application-dirs.patch rename to pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch diff --git a/pkgs/development/libraries/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix similarity index 93% rename from pkgs/development/libraries/libcprime/default.nix rename to pkgs/applications/misc/cubocore-packages/libcprime/default.nix index d312c832243..00e297bf276 100644 --- a/pkgs/development/libraries/libcprime/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -19,7 +19,9 @@ mkDerivation rec { sha256 = "sha256-RywvFATA/+fDP/TR5QRWaJlDgy3EID//iVmrJcj3GXI="; }; - patches = [ ./0001-fix-application-dirs.patch ]; + patches = [ + ./0001-fix-application-dirs.patch + ]; nativeBuildInputs = [ cmake diff --git a/pkgs/development/libraries/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix similarity index 98% rename from pkgs/development/libraries/libcsys/default.nix rename to pkgs/applications/misc/cubocore-packages/libcsys/default.nix index cec6e501bb5..d1dde9942e9 100644 --- a/pkgs/development/libraries/libcsys/default.nix +++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja, }: +{ mkDerivation, lib, fetchFromGitLab, udisks2, qtbase, cmake, ninja }: mkDerivation rec { pname = "libcsys"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff0b603190e..52fc9b1286a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -997,10 +997,6 @@ with pkgs; cool-retro-term = libsForQt5.callPackage ../applications/terminal-emulators/cool-retro-term { }; - coreterminal = libsForQt5.callPackage ../applications/terminal-emulators/coreterminal { - inherit (lxqt) qtermwidget; - }; - ctx = callPackage ../applications/terminal-emulators/ctx { }; darktile = callPackage ../applications/terminal-emulators/darktile { }; @@ -1504,8 +1500,6 @@ with pkgs; codeql = callPackage ../development/tools/analysis/codeql { }; - corearchiver = libsForQt5.callPackage ../tools/archivers/corearchiver { }; - container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { }; @@ -4102,16 +4096,8 @@ with pkgs; qtbase = qt5.qtbase; }; - coregarage = libsForQt5.callPackage ../applications/misc/coregarage { }; - - coreshot = libsForQt5.callPackage ../tools/misc/coreshot { }; - c14 = callPackage ../applications/networking/c14 { }; - corehunt = libsForQt5.callPackage ../applications/misc/corehunt { }; - - coretoppings = libsForQt5.callPackage ../applications/misc/coretoppings { }; - certstrap = callPackage ../tools/security/certstrap { }; cfssl = callPackage ../tools/security/cfssl { }; @@ -6704,10 +6690,6 @@ with pkgs; libscrypt = callPackage ../development/libraries/libscrypt { }; - libcsys = libsForQt5.callPackage ../development/libraries/libcsys { }; - - libcprime = libsForQt5.callPackage ../development/libraries/libcprime { }; - libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; libcoap = callPackage ../applications/networking/libcoap { @@ -13206,6 +13188,13 @@ with pkgs; ### END OF LUA + ### CuboCore + CuboCore = recurseIntoAttrs (import ./cubocore-packages.nix { + inherit newScope lxqt lib libsForQt5; + }); + + ### End of CuboCore + lush2 = callPackage ../development/interpreters/lush {}; maude = callPackage ../development/interpreters/maude { @@ -23707,8 +23696,6 @@ with pkgs; cheesecutter = callPackage ../applications/audio/cheesecutter { }; - corefm = libsForQt5.callPackage ../applications/misc/corefm { }; - milkytracker = callPackage ../applications/audio/milkytracker { }; ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; @@ -24053,8 +24040,6 @@ with pkgs; copyq = libsForQt5.callPackage ../applications/misc/copyq { }; - coreaction = libsForQt5.callPackage ../applications/misc/coreaction { }; - corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; coriander = callPackage ../applications/video/coriander { @@ -24065,8 +24050,6 @@ with pkgs; ffmpeg = ffmpeg-full; }; - coreimage = libsForQt5.callPackage ../applications/graphics/coreimage { }; - csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { }; diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix new file mode 100644 index 00000000000..3c6ed65e928 --- /dev/null +++ b/pkgs/top-level/cubocore-packages.nix @@ -0,0 +1,94 @@ +{ newScope, lxqt, lib, libsForQt5 }: + +let + packages = self: with self; { + + # Libs + libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { }; + + libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { }; + + # Apps + coreaction = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreaction { + inherit libcprime libcsys; + }; + + corearchiver = libsForQt5.callPackage ../applications/misc/cubocore-packages/corearchiver { + inherit libcprime libcsys; + }; + + corefm = libsForQt5.callPackage ../applications/misc/cubocore-packages/corefm { + inherit libcprime libcsys; + }; + + coregarage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coregarage { + inherit libcprime libcsys; + }; + + corehunt = libsForQt5.callPackage ../applications/misc/cubocore-packages/corehunt { + inherit libcprime libcsys; + }; + + coreimage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreimage { + inherit libcprime libcsys; + }; + + coreinfo = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreinfo { + inherit libcprime libcsys; + }; + + corekeyboard = libsForQt5.callPackage ../applications/misc/cubocore-packages/corekeyboard { + inherit libcprime libcsys; + }; + + corepad = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepad { + inherit libcprime libcsys; + }; + + corepaint = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepaint { + inherit libcprime libcsys; + }; + + corepdf = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepdf { + inherit libcprime libcsys; + }; + + corepins = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepins { + inherit libcprime libcsys; + }; + + corerenamer = libsForQt5.callPackage ../applications/misc/cubocore-packages/corerenamer { + inherit libcprime libcsys; + }; + + coreshot = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreshot { + inherit libcprime libcsys; + }; + + corestats = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestats { + inherit libcprime libcsys; + }; + + corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff { + inherit libcprime libcsys; + }; + + coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal { + inherit (lxqt) qtermwidget; + inherit libcprime libcsys; + }; + + coretime = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretime { + inherit libcprime libcsys; + }; + + coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings { + inherit libcprime libcsys; + }; + + coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse { + inherit libcprime libcsys; + }; + }; +in +lib.makeScope newScope packages