From 0e902d14e45b491054272a6bd00cf3e40aaf3cf4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 14 Oct 2022 14:51:58 -0400 Subject: [PATCH 1/6] nongnu: Add discord. * nongnu/packages/messaging.scm (discord): New variable. --- nongnu/packages/messaging.scm | 124 ++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 1d833e21..01d57943 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -47,6 +47,130 @@ #:use-module ((nonguix licenses) :prefix license:) #:use-module (ice-9 match)) +(define-public discord + (package + (name "discord") + (version "0.0.20") + (source + (origin + (method url-fetch) + (uri + (string-append + "https://dl.discordapp.net/apps/linux/" version "/" name "-" version ".deb")) + (sha256 + (base32 "036pg6xi6jwn7qadfbdq88w55mwyszy83sq4xnfbhm1xw5gmn16n")))) + (supported-systems '("x86_64-linux")) + (build-system binary-build-system) + (arguments + (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files + #:patchelf-plan + #~'(("lib/discord/Discord" + ("alsa-lib" "at-spi2-atk" "at-spi2-core" "atk" "cairo" "cups" + "dbus" "expat" "fontconfig-minimal" "gcc" "gdk-pixbuf" "glib" + "gtk+" "libdrm" "libnotify" "libx11" "libxcb" + "libxcomposite" "libxcursor" "libxdamage" "libxext" "libxfixes" + "libxi" "libxkbcommon" "libxkbfile" "libxrandr" "libxshmfence" + "libxrender" "libxkbcommon" "libxkbfile" "libxrandr" "libxtst" + "libxtst" "mesa" "nspr" "pango" "pulseaudio" "zlib"))) + #:phases + #~(modify-phases %standard-phases + (replace 'unpack + (lambda _ + (invoke "ar" "x" #$source) + (invoke "tar" "xvf" "data.tar.gz") + (copy-recursively "usr/" ".") + ;; Use the more standard lib directory for everything. + (mkdir-p "lib") + (rename-file "share/discord" "lib/discord") + ;; Remove unneeded files. + (delete-file-recursively "bin") + (delete-file "control.tar.gz") + (delete-file "data.tar.gz") + (delete-file "debian-binary"))) + (add-after 'unpack 'fix-desktop-file + (lambda _ + ;; Fix the .desktop file binary location. + (rename-file "lib/discord/discord.desktop" "share/applications/discord.desktop") + (substitute* '("share/applications/discord.desktop") + (("/usr/share/") + (string-append #$output "/lib/"))) + ;; And move the icon, replacing the (broken) symlink. + (rename-file "lib/discord/discord.png" "share/pixmaps/discord.png"))) + (add-after 'install 'symlink-binary-file-and-cleanup + (lambda _ + (delete-file (string-append #$output "/environment-variables")) + (mkdir-p (string-append #$output "/bin")) + (symlink (string-append #$output "/lib/discord/Discord") + (string-append #$output "/bin/discord")))) + (add-after 'install 'wrap-where-patchelf-does-not-work + (lambda _ + (wrap-program (string-append #$output "/lib/discord/Discord") + `("FONTCONFIG_PATH" ":" prefix + (,(string-join + (list + (string-append #$(this-package-input "fontconfig-minimal") "/etc/fonts") + #$output) + ":"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-join + (list + (string-append #$(this-package-input "nss") "/lib/nss") + (string-append #$(this-package-input "eudev") "/lib") + (string-append #$(this-package-input "gcc") "/lib") + (string-append #$(this-package-input "libnotify") "/lib") + (string-append #$(this-package-input "libxkbfile") "/lib") + (string-append #$(this-package-input "mesa") "/lib") + (string-append #$(this-package-input "pulseaudio") "/lib") + (string-append #$(this-package-input "sqlcipher") "/lib") + (string-append #$(this-package-input "zlib") "/lib") + (string-append #$output "/lib/discord") + #$output) + ":"))))))))) + (native-inputs (list tar)) + (inputs + (list alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + eudev + expat + fontconfig + `(,gcc "lib") + glib + gtk+ + libdrm + libnotify + librsvg + libx11 + libxcb + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxkbcommon + libxkbfile + libxrandr + libxrender + libxshmfence + libxtst + mesa + nspr + nss + pango + pulseaudio + sqlcipher + zlib)) + (home-page "https://discord.com/") + (synopsis "All-in-one voice, video, and text chat for gamers") + (description "Discord is a cross-platform text, voice, and video chat platform aimed at +gamers.") + (license (license:nonfree "https://discord.com/terms")))) + (define-public element-desktop (package (name "element-desktop") From 5c13dbf132cb2a542ff2899da51b0ad2dba2714a Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 16 Jun 2025 22:17:31 +0800 Subject: [PATCH 2/6] transformations: nvidia: Set nvidia_drm.modeset explicitly. * nonguix/transformations.scm (nonguix-transformation-nvidia): Set nvidia_drm.modeset to 0 when kernel-mode-setting? is #f. --- nonguix/transformations.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 90dab066..1647c5bd 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -128,11 +128,10 @@ TODO: Xorg configuration." (operating-system (inherit os) (kernel-arguments - `("modprobe.blacklist=nouveau" - ,@(if kernel-mode-setting? - '("nvidia_drm.modeset=1") - '()) - ,@(operating-system-user-kernel-arguments os))) + (cons* "modprobe.blacklist=nouveau" + (string-append + "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) + (operating-system-user-kernel-arguments os))) (services `(,(or (assoc-ref %presets driver) (leave From 70a0de71d0c85c6c69b81c22040478081663d394 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Mon, 16 Jun 2025 00:18:54 +0800 Subject: [PATCH 3/6] transformations: Deduplicate transformed field values. * nonguix/transformations.scm (nonguix-transformation-guix)[substitute-urls]: Delete duplicates. (nonguix-transformation-nvidia)[kernel-arguments]: Likewise. --- nonguix/transformations.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index 1647c5bd..f3b5e771 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2025 Hilton Chain (define-module (nonguix transformations) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (guix channels) #:use-module (guix diagnostics) #:use-module (guix gexp) @@ -74,10 +76,11 @@ FIXME: GUIX-SOURCE? is disabled by default due to performance issue." (cons %nonguix-signing-key (guix-configuration-authorized-keys config))) (substitute-urls - `(,@(guix-configuration-substitute-urls config) - ,@(if substitutes? - '("https://substitutes.nonguix.org") - '())))))))))) + (delete-duplicates + `(,@(guix-configuration-substitute-urls config) + ,@(if substitutes? + '("https://substitutes.nonguix.org") + '()))))))))))) (define* (nonguix-transformation-linux #:key (linux linux) (firmware (list linux-firmware)) @@ -128,10 +131,13 @@ TODO: Xorg configuration." (operating-system (inherit os) (kernel-arguments - (cons* "modprobe.blacklist=nouveau" - (string-append - "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) - (operating-system-user-kernel-arguments os))) + (delete-duplicates + (cons* "modprobe.blacklist=nouveau" + (string-append + "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) + (remove + (cut string-prefix? "nvidia_drm.modeset=" <>) + (operating-system-user-kernel-arguments os))))) (services `(,(or (assoc-ref %presets driver) (leave From bfe682b9ab94de5ca58b214b134260f700321d73 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 19 Jun 2025 10:13:21 +0200 Subject: [PATCH 4/6] nongnu: signal-desktop: Update to 7.58.0. * nongnu/packages/messaging.scm (signal-desktop): Update to 7.58.0. Signed-off-by: Hilton Chain --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 12d88625..675c6d2c 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -83,7 +83,7 @@ its core.") (define-public signal-desktop (package (name "signal-desktop") - (version "7.57.0") + (version "7.58.0") (source (origin (method url-fetch) @@ -92,7 +92,7 @@ its core.") "https://updates.signal.org/desktop/apt/pool/s/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "0xy4xfyx58v0869x0inypy9rgnbcxzrdnfh3r8qq00640wfj9j2c")))) + (base32 "1bhh9z7mclxlzq4pfs695pnkb5x36wm5ihniydvzqqi2g3xjbqam")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments From 382df31152dc01cd6fe4a75525e14a9d05bf0c9b Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Fri, 20 Jun 2025 20:38:44 +0800 Subject: [PATCH 5/6] nongnu: nvidia-driver: Update to 570.169. * nongnu/packages/nvidia.scm (nvidia-driver): Update to 570.169. (nvidia-settings): Likewise. --- nongnu/packages/nvidia.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm index 86d4b26d..8e0b234d 100644 --- a/nongnu/packages/nvidia.scm +++ b/nongnu/packages/nvidia.scm @@ -228,9 +228,9 @@ ACTION==\"unbind\", SUBSYSTEM==\"pci\", ATTR{vendor}==\"0x10de\", ATTR{class}==\ (define-public nvidia-driver (package (name "nvidia-driver") - (version "570.153.02") + (version "570.169") (source (nvidia-source - version "1dp1bpx4scx7lzqnajn75q5zjlbfvpjych3ils7zlxlmyvj8d20l")) + version "0r9phz9rv0n208f61lvv3m492387mjmqk4gph3ww7iawg53shcjz")) (build-system copy-build-system) (arguments (list #:modules '((guix build copy-build-system) @@ -627,9 +627,9 @@ add @code{nvidia_drm.modeset=1} to @code{kernel-arguments} as well.") (define-public nvidia-settings (package (name "nvidia-settings") - (version "570.153.02") + (version "570.169") (source (nvidia-settings-source - name version "1qvvsrhlswpnv9aldqnynjch8y1x219ccsk3w4rfrw3swxm9qvp6")) + name version "15sxzczan9kq55hyiq73arls95lsdakpfbbzf4b6741fjfgd8kfh")) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite From 94c750ad596f513d5659ce9909022ed09f864537 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 21 Jun 2025 15:57:07 -0400 Subject: [PATCH 6/6] nongnu: element-desktop: Update to 1.11.104. * nongnu/packages/messaging.scm (element-desktop): Update to 1.11.104. --- nongnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nongnu/packages/messaging.scm b/nongnu/packages/messaging.scm index 675c6d2c..234e417f 100644 --- a/nongnu/packages/messaging.scm +++ b/nongnu/packages/messaging.scm @@ -37,7 +37,7 @@ (define-public element-desktop (package (name "element-desktop") - (version "1.11.103") + (version "1.11.104") (source (origin (method url-fetch) @@ -46,7 +46,7 @@ "https://packages.riot.im/debian/pool/main/e/" name "/" name "_" version "_amd64.deb")) (sha256 - (base32 "1apnj9n428lc9cw6jlmnqhcywqd6fnplkj3j5k731f2dzvzaifs6")))) + (base32 "1b1rzcsf0pdgccsl0cmrp9lnrcbhy50ygwkwik7hdnygr2721mbl")))) (supported-systems '("x86_64-linux")) (build-system chromium-binary-build-system) (arguments