From fbaaf97b1c5fc0fffaa13be6a3e1f270a6643fc7 Mon Sep 17 00:00:00 2001 From: bdunahu Date: Thu, 19 Mar 2026 13:05:48 -0400 Subject: tanelorn: Attempt to fix alpha-transparency with inputs. * /modules/tanelorn/packages/emacs.scm (emacs-next-alpha-fix): [source]: <#:origin>: remove. [arguments] <#:inputs>: add librender, libxt. --- modules/tanelorn/packages/emacs-xyz.scm | 5 +++-- modules/tanelorn/packages/emacs.scm | 32 +++++--------------------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/modules/tanelorn/packages/emacs-xyz.scm b/modules/tanelorn/packages/emacs-xyz.scm index 77356ec..0c999a7 100644 --- a/modules/tanelorn/packages/emacs-xyz.scm +++ b/modules/tanelorn/packages/emacs-xyz.scm @@ -10,6 +10,7 @@ #:use-module (guix download) #:use-module (gnu packages emacs-build) #:use-module (guix build-system emacs) + #:use-module (tanelorn packages emacs) #:use-module (guix git-download)) (define-public emacs-jeison @@ -22,8 +23,8 @@ (origin (method git-fetch) (uri (git-reference - (url "https://github.com/SavchenkoValeriy/jeison") - (commit commit))) + (url "https://github.com/SavchenkoValeriy/jeison") + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "1ipmh2zg1pffpkk00wr2d8s3g51bnv3kmnci8g79i7vnm3i4my85")))) diff --git a/modules/tanelorn/packages/emacs.scm b/modules/tanelorn/packages/emacs.scm index bac2db9..e4a2a35 100644 --- a/modules/tanelorn/packages/emacs.scm +++ b/modules/tanelorn/packages/emacs.scm @@ -9,33 +9,11 @@ #:use-module (guix download) #:use-module (tanelorn packages) #:use-module (guix packages) + #:use-module (gnu packages xorg) #:use-module (gnu packages emacs)) (define-public emacs-next-alpha-fix - (let ((commit "509228fc6c026921c67459f21164e0325efc583b") - (revision "2") - (name "emacs-next-alpha-fix")) - (emacs->emacs-next - emacs - name - #:source - (origin - (inherit (package-source emacs-minimal)) - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/emacs.git") - (commit commit))) - (file-name (git-file-name name - (git-version "31.0.50" revision commit))) - (sha256 - (base32 "04aalyrx5jysk5fhlka98fhfx23sy99zp8j16i0ils20sflyig6n")) - (patches - (tanelorn-patches "emacs-next-disable-jit-compilation.patch" - "emacs-next-exec-path.patch" - "emacs-fix-scheme-indent-function.patch" - "emacs-native-comp-driver-options.patch" - "emacs-next-native-comp-fix-filenames.patch" - "emacs-native-comp-pin-packages.patch" - - ;; fixes an issue with alpha-transparency - "emacs-fix-transparency.patch")))))) + (package/inherit emacs-next + (name "emacs-next-alpha-fix") + (inputs (modify-inputs (package-inputs emacs-next) + (prepend libxrender libxt))))) -- cgit v1.2.3