Merge branch 'discord' into 'master'

Draft: Add Discord.

See merge request nonguix/nonguix!225

nongnu/packages/messaging.scm

@@ -34,10 +34,134 @@
   #: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")
-    (version "1.11.103")
+    (version "1.11.104")
     (source
      (origin
        (method url-fetch)
@@ -46,7 +170,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
@@ -83,7 +207,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 +216,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

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

nonguix/transformations.scm

@@ -2,6 +2,8 @@
 ;;; Copyright © 2025 Hilton Chain <hako@ultrarare.space>
 
 (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)
+                      (delete-duplicates
-                        ,@(if substitutes?
+                       `(,@(guix-configuration-substitute-urls config)
-                              '("https://substitutes.nonguix.org")
+                         ,@(if substitutes?
-                              '()))))))))))
+                               '("https://substitutes.nonguix.org")
+                               '())))))))))))
 
 (define* (nonguix-transformation-linux #:key (linux linux)
                                        (firmware (list linux-firmware))
@@ -128,11 +131,13 @@ TODO: Xorg configuration."
     (operating-system
       (inherit os)
       (kernel-arguments
-       `("modprobe.blacklist=nouveau"
+       (delete-duplicates
-         ,@(if kernel-mode-setting?
+        (cons* "modprobe.blacklist=nouveau"
-               '("nvidia_drm.modeset=1")
+               (string-append
-               '())
+                "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0"))
-         ,@(operating-system-user-kernel-arguments os)))
+               (remove
+                (cut string-prefix? "nvidia_drm.modeset=" <>)
+                (operating-system-user-kernel-arguments os)))))
       (services
        `(,(or (assoc-ref %presets driver)
               (leave