From cfd7d1fc2ea9a224215c40046a2568f3f5f41fe9 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 21 Apr 2024 16:52:32 +0200 Subject: [PATCH] packages/textpieces: unpatch --- modules/desktop/package-sets.nix | 2 +- packages/patched-derivations.nix | 2 -- patches/base/textpieces/GHPR_138.patch | 26 -------------------------- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 patches/base/textpieces/GHPR_138.patch diff --git a/modules/desktop/package-sets.nix b/modules/desktop/package-sets.nix index 30b5019..fb7fb34 100644 --- a/modules/desktop/package-sets.nix +++ b/modules/desktop/package-sets.nix @@ -62,7 +62,7 @@ d-spy emblem sysprof - custom.textpieces + textpieces custom.git-remote-ipld custom.webfont-kit-generator ]; diff --git a/packages/patched-derivations.nix b/packages/patched-derivations.nix index 2f9f777..141c477 100644 --- a/packages/patched-derivations.nix +++ b/packages/patched-derivations.nix @@ -42,6 +42,4 @@ super: rec { tilix-high-refresh-rate = super.tilix.override { gtkd = super.gtkd.override { vte = vte-high-refresh-rate; }; }; blackbox-high-refresh-rate = (patch' super.blackbox-terminal).override { vte-gtk4 = vte-gtk4-high-refresh-rate; }; - - textpieces = patch' (super.textpieces.overrideAttrs { meta.broken = false; }); } diff --git a/patches/base/textpieces/GHPR_138.patch b/patches/base/textpieces/GHPR_138.patch deleted file mode 100644 index 31a3fdf..0000000 --- a/patches/base/textpieces/GHPR_138.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/resources/ui/Editor.blp b/resources/ui/Editor.blp -index b98edc7..5c3f993 100644 ---- a/resources/ui/Editor.blp -+++ b/resources/ui/Editor.blp -@@ -42,7 +42,7 @@ template TextPiecesEditor : Adw.Bin { - hexpand: false; - width-request: 300; - margin-top: 5; -- margin-bottom: 2.5; -+ margin-bottom: 3; - margin-start: 5; - margin-end: 10; - spacing: 3; -diff --git a/resources/ui/SearchBar.blp b/resources/ui/SearchBar.blp -index d810558..b7d9232 100644 ---- a/resources/ui/SearchBar.blp -+++ b/resources/ui/SearchBar.blp -@@ -15,7 +15,7 @@ template TextPiecesSearchBar : Adw.Bin { - ] - - margin-top: 5; -- margin-bottom: 2.5; -+ margin-bottom: 3; - margin-start: 5; - margin-end: 10; - row-spacing: 6;