From 97a4c8af6f03f3a12af8cb95524ec0ffd7cc7727 Mon Sep 17 00:00:00 2001 From: JohnMolotov Date: Sun, 8 Dec 2024 15:37:20 +1000 Subject: [PATCH 1/4] maintainers: add JohnMolotov --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index effe1f76b9202..768c78974e3f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10792,6 +10792,12 @@ githubId = 2576152; name = "John M. Harris, Jr."; }; + JohnMolotov = { + name = "John Molotov"; + email = "johnmolotov@cryptolab.net"; + github = "JohnMolotov"; + githubId = 171455312; + }; johnpyp = { name = "John Paul Penaloza"; email = "johnpyp.dev@gmail.com"; From a302af86337fb030774153c998f87908562ac72b Mon Sep 17 00:00:00 2001 From: JohnMolotov Date: Tue, 12 Nov 2024 19:16:50 +1000 Subject: [PATCH 2/4] qsp: init --- pkgs/by-name/qs/qsp/package.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/qs/qsp/package.nix diff --git a/pkgs/by-name/qs/qsp/package.nix b/pkgs/by-name/qs/qsp/package.nix new file mode 100644 index 0000000000000..0285b088ce957 --- /dev/null +++ b/pkgs/by-name/qs/qsp/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + oniguruma, +}: +stdenv.mkDerivation { + name = "qsp"; + version = "0-unstable-2024-11-27"; + src = fetchFromGitHub { + owner = "QSPFoundation"; + repo = "qsp"; + rev = "f6ede7f8756e49604de056fcbdfe99fa4abd4812"; + sha256 = "MoNam2IFnLpk02tKp+lkl4l+mBiaWNPhFc3/n4zUHcw="; + }; + buildInputs = [ oniguruma ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + cmakeFlags = [ (lib.cmakeBool "USE_INSTALLED_ONIGURUMA" true) ]; + meta = { + description = "QuestSoft game engine"; + homepage = "https://qsp.org/"; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.JohnMolotov ]; + }; +} From 7b7f87476b7e66a5c68e3d395156d54fe0d51784 Mon Sep 17 00:00:00 2001 From: JohnMolotov Date: Sun, 8 Dec 2024 15:47:55 +1000 Subject: [PATCH 3/4] qqsp: init at 1.9 --- pkgs/by-name/qq/qqsp/package.nix | 59 ++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/qq/qqsp/package.nix diff --git a/pkgs/by-name/qq/qqsp/package.nix b/pkgs/by-name/qq/qqsp/package.nix new file mode 100644 index 0000000000000..7736f2b127dec --- /dev/null +++ b/pkgs/by-name/qq/qqsp/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitHub, + adwaita-qt, + libadwaita, + adw-gtk3, + gst_all_1, + gnome-themes-extra, + librsvg, + qt5, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "qqsp"; + version = "1.9"; + src = fetchFromGitHub { + owner = "Sonnix1"; + repo = "Qqsp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eDgoa+/dcJ8Ti+YLHgKUKus0+zRrFEuJ19wUpbFpcBU="; + }; + buildInputs = [ + adwaita-qt + libadwaita + adw-gtk3 + gnome-themes-extra + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + qt5.qtmultimedia + qt5.qtwebengine + qt5.qtbase + ]; + nativeBuildInputs = [ + qt5.qmake + qt5.qtbase + qt5.qtmultimedia + qt5.qtwebengine + qt5.wrapQtAppsHook + librsvg + ]; + installPhase = '' + install -D Qqsp $out/bin/Qqsp + install -D $src/icons/qsp-logo-vector.svg $out/icons/scalable/apps/qsp.svg + install -D $src/Qqsp.desktop $out/share/applications/Qqsp.desktop + install -D $src/qsp.mime $out/share/mime/packages/qsp.xml + for i in 16 24 32 48 64 96 128 256 512; do + mkdir -p $out/share/icons/''${i}x$i/apps + rsvg-convert -w $i -h $i -f png $src/icons/qsp-logo-vector.svg -o $out/share/icons/''${i}x$i/apps/qsp.png + done + ''; + meta = { + description = "Qt Quest Soft Player"; + license = lib.licenses.mit; + homepage = "https://gitlab.com/Sonnix1/Qqsp"; + platforms = lib.platforms.unix ++ lib.platforms.windows; + mainProgram = "Qqsp"; + maintainers = [ lib.maintainers.JohnMolotov ]; + }; +}) From 23f80b278070c597b56658f7925fcd22439e890c Mon Sep 17 00:00:00 2001 From: JohnMolotov Date: Thu, 26 Dec 2024 11:01:13 +1000 Subject: [PATCH 4/4] fixup! qsp: init Co-authored-by: Leah Amelia Chen --- pkgs/by-name/qs/qsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/qs/qsp/package.nix b/pkgs/by-name/qs/qsp/package.nix index 0285b088ce957..e8f9e2456b5a5 100644 --- a/pkgs/by-name/qs/qsp/package.nix +++ b/pkgs/by-name/qs/qsp/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "QSPFoundation"; repo = "qsp"; rev = "f6ede7f8756e49604de056fcbdfe99fa4abd4812"; - sha256 = "MoNam2IFnLpk02tKp+lkl4l+mBiaWNPhFc3/n4zUHcw="; + hash = "sha256-MoNam2IFnLpk02tKp+lkl4l+mBiaWNPhFc3/n4zUHcw="; }; buildInputs = [ oniguruma ]; nativeBuildInputs = [