From 2bd9d62bfedd80da9307fa2c409e1111a6869921 Mon Sep 17 00:00:00 2001 From: Anton Gusev Date: Sun, 3 Dec 2023 18:09:25 +0300 Subject: [PATCH 1/2] maintainers: add uartman --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6f81c17e2b0b..0d116f9ffdcf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18784,6 +18784,12 @@ github = "uakci"; githubId = 6961268; }; + uartman = { + name = "Anton Gusev"; + email = "uartman@mail.ru"; + github = "UARTman"; + githubId = 21099202; + }; udono = { email = "udono@virtual-things.biz"; github = "udono"; From 0cdcc5febbfd1083dc82466bdfc46f3154f41636 Mon Sep 17 00:00:00 2001 From: Anton Gusev Date: Sun, 3 Dec 2023 18:10:16 +0300 Subject: [PATCH 2/2] gtkclipblock: init at 0.2.2 gtkclipblock: fix formatting gtkclipblock: remove trailing whitespace gtkclipblock: change sha256 to hash in fetchFromGitHub calls gtkclipblock: reformat with blank lines gtkclipblock: set dontUseCmakeConfigure gtkclipblock: change to by-name hierarchy gtkclipblock: clarify description Co-authored-by: Peder Bergebakken Sundt gtkclipblock: restrict platform to x86 linux Co-authored-by: Peder Bergebakken Sundt gtkclipblock: factor more things out into vars Co-authored-by: Anderson Torres --- pkgs/by-name/gt/gtkclipblock/package.nix | 51 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/by-name/gt/gtkclipblock/package.nix diff --git a/pkgs/by-name/gt/gtkclipblock/package.nix b/pkgs/by-name/gt/gtkclipblock/package.nix new file mode 100644 index 000000000000..a4d5400af6fe --- /dev/null +++ b/pkgs/by-name/gt/gtkclipblock/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, cmake +, ninja +, pkg-config +, gtk2 +, gtk3 +, gtk4 +}: + +let + distorm-src = fetchFromGitHub { + owner = "gdabah"; + repo = "distorm"; + rev = "3.5.2b"; + hash = "sha256-2ftEV3TMS3HT7f96k+Pwt3Mm31fVEXcHpcbbz05jycU="; + }; + pname = "gtkclipblock"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "notpeelz"; + repo = "gtkclipblock"; + rev = "v${version}"; + hash = "sha256-ok/D7M0KekN8zf8AzhcOLtedbYVRHHv3m9zEHsJfcPM="; + fetchSubmodules = true; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ meson cmake ninja pkg-config ]; + + buildInputs = [ gtk2 gtk3 gtk4 ]; + + postPatch = '' + substituteInPlace subprojects/funchook-helper/subprojects/funchook/CMakeLists.txt \ + --replace "GIT_REPOSITORY https://github.com/gdabah/distorm.git" "SOURCE_DIR ${distorm-src}" + ''; + + dontUseCmakeConfigure = true; + + meta = with lib; { + description = "A LD_PRELOAD hack to prevent GTK programs from interacting with the primary clipboard"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ uartman ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 274e3bc36e98..51c5da1bebb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8974,6 +8974,8 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog { }; + gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; }; + gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { };