From 4f010615bd29df960e6744996e4104e03697f05e Mon Sep 17 00:00:00 2001 From: Matthieu Barthel Date: Wed, 20 Jul 2022 18:01:37 +0200 Subject: [PATCH 1/2] clipqr: init at 1.0.0 clipqr: add myself in maintainers list clipqr: add gpg fingerprint + fix syntax clipqr: sort maintainer entry clipqr: fix syntax Co-authored-by: Azat Bahawi clipqr: add strip flags Co-authored-by: Azat Bahawi clipqr: use pkg-config Co-authored-by: Azat Bahawi clipqr: fix syntax Co-authored-by: Azat Bahawi clipqr: fix syntax + remove xorg dev outputs clipqr: misc fixes --- pkgs/applications/misc/clipqr/default.nix | 70 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 72 insertions(+) create mode 100644 pkgs/applications/misc/clipqr/default.nix diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix new file mode 100644 index 000000000000..7a83da6222a2 --- /dev/null +++ b/pkgs/applications/misc/clipqr/default.nix @@ -0,0 +1,70 @@ +{ buildGoModule +, copyDesktopItems +, fetchFromGitLab +, lib +, libGL +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, makeDesktopItem +, mesa +, pkg-config +}: + +buildGoModule rec { + pname = "clipqr"; + version = "1.0.0"; + + src = fetchFromGitLab { + owner = "imatt-foss"; + repo = "clipqr"; + rev = "v${version}"; + sha256 = "sha256-E90nTJtx4GOacu8M7oQBznnSQVDIZatibgKMZEpTUaQ="; + }; + + vendorSha256 = "5kAOSyVbvot4TX/XfRNe1/zZk6fa7pS1Dvn9nz11u3U="; + + ldflags = [ "-s" "-w" ]; + + buildInputs = [ + libGL + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + mesa + ]; + + nativeBuildInputs = [ + copyDesktopItems + pkg-config + ]; + + postInstall = '' + install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ClipQR"; + desktopName = "ClipQR"; + exec = "clipqr"; + categories = [ "Utility" ]; + icon = "clipqr"; + comment = "Scan QR codes on screen and from camera"; + genericName = "ClipQR"; + }) + ]; + + meta = with lib; { + description = "Scan QR codes on screen and from camera, the result is in your clipboard"; + license = licenses.mit; + maintainers = with maintainers; [ MatthieuBarthel ]; + homepage = "https://gitlab.com/imatt-foss/clipqr"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4221ad132814..8ff8b6b038c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26187,6 +26187,8 @@ with pkgs; clipit = callPackage ../applications/misc/clipit { }; + clipqr = callPackage ../applications/misc/clipqr { }; + cloud-hypervisor = callPackage ../applications/virtualization/cloud-hypervisor { }; clp = callPackage ../applications/science/math/clp { }; From 85518f0ef0c20cdc7852207eaf47bec55c4d86bb Mon Sep 17 00:00:00 2001 From: Matthieu Barthel Date: Fri, 22 Jul 2022 18:26:37 +0200 Subject: [PATCH 2/2] clipqr: add myself as maintainer --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index acc04a533f60..7fed606607b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8022,6 +8022,15 @@ githubId = 427866; name = "Matthias Beyer"; }; + MatthieuBarthel = { + email = "matthieu@imatt.ch"; + name = "Matthieu Barthel"; + github = "MatthieuBarthel"; + githubId = 435534; + keys = [{ + fingerprint = "80EB 0F2B 484A BB80 7BEF 4145 BA23 F10E AADC 2E26"; + }]; + }; matthuszagh = { email = "huszaghmatt@gmail.com"; github = "matthuszagh";