From da26390c4013d6ac18ee4f4294fac4e36004f433 Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Tue, 25 Feb 2025 23:10:22 +0100 Subject: [PATCH 1/2] maintainers: add dtomvan --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b18b0ce7c27b..ac5afee61b6d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6551,6 +6551,13 @@ github = "dsymbol"; githubId = 88138099; }; + dtomvan = { + email = "18gatenmaker6@gmail.com"; + github = "dtomvan"; + githubId = 51440893; + name = "Tom van Dijk"; + keys = [ { fingerprint = "D044 F07B 8863 B681 26BD 79FE 7A98 4C82 07AD BA51"; } ]; + }; dtzWill = { email = "w@wdtz.org"; github = "dtzWill"; From dc2a52164dc56e82136fb202ad9417a13151234d Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Mon, 31 Mar 2025 17:09:12 +0200 Subject: [PATCH 2/2] slint-viewer: init at 1.10.0 Co-authored-by: awwpotato <153149335+awwpotato@users.noreply.github.com> --- pkgs/by-name/sl/slint-viewer/package.nix | 52 ++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/sl/slint-viewer/package.nix diff --git a/pkgs/by-name/sl/slint-viewer/package.nix b/pkgs/by-name/sl/slint-viewer/package.nix new file mode 100644 index 000000000000..09b252ec294c --- /dev/null +++ b/pkgs/by-name/sl/slint-viewer/package.nix @@ -0,0 +1,52 @@ +{ + lib, + rustPlatform, + fetchCrate, + kdePackages, + libGL, + nix-update-script, + versionCheckHook, + withQt6Support ? true, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "slint-viewer"; + version = "1.10.0"; + + src = fetchCrate { + inherit (finalAttrs) pname version; + hash = "sha256-i6JB/bc8lQE9K9Jy1mUz2I/LKIoEtc/dgJzsQTcEXeQ="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-fXREHHPR2CZtyvvOdL5wKnkmT1q9Xj+ik2lR/52ApLI="; + + CXXFLAGS = lib.optionals withQt6Support [ + "-I ${lib.getDev libGL}/include" + ]; + + nativeBuildInputs = lib.optionals withQt6Support ( + with kdePackages; + [ + qtbase + qtsvg + wrapQtAppsHook + ] + ); + + # There are no tests + doCheck = false; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Viewer for .slint files from the Slint Project"; + mainProgram = "slint-viewer"; + homepage = "https://github.com/slint-ui/slint/tree/master/tools/viewer"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + maintainers = with lib.maintainers; [ dtomvan ]; + }; +})