diff options
Diffstat (limited to 'vesktop.scm')
| -rw-r--r-- | vesktop.scm | 85 |
1 files changed, 65 insertions, 20 deletions
diff --git a/vesktop.scm b/vesktop.scm index fe6feae..0a24160 100644 --- a/vesktop.scm +++ b/vesktop.scm @@ -19,40 +19,92 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages elf) + #:use-module (gnu packages bash) + #:use-module (gnu packages databases) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix build-system) + #:use-module (guix build-system gnu) #:use-module (guix utils) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix transformations) #:use-module (nonguix build-system binary) #:use-module (nonguix build-system chromium-binary) #:use-module (nonguix licenses) #:use-module (ice-9 match) + #:use-module (ice-9 session) #:use-module (srfi srfi-1) ) -(define (aggressively-purge-old-gcc bs toolchain) +(define (use-modern-gcc-on-chromium-binary bs) "Based on guix build-system build-system-with-c-toolchain" (define lower (build-system-lower bs)) - (define toolchain-packages - '("gcc" "gcc:lib" "binutils" "libc" "libc:static" "ld-wrapper")) - (define (lower* . args) (let ((lowered (apply lower args))) (bag (inherit lowered) (host-inputs - (append (fold alist-delete - (bag-build-inputs lowered) - toolchain-packages) - toolchain))))) + `( + ("source" , mesa) ;For some reason requires a "source" decleration, or else will fail. This is a placeholder value. TODO: Find a way to remove this without breakage. + ("alsa-lib" ,alsa-lib) + ("atk" ,atk) + ("at-spi2-atk" ,at-spi2-atk) + ("at-spi2-core" ,at-spi2-core) + ("bash-minimal" ,bash-minimal) + ("cairo" ,cairo) + ("cups" ,cups) + ("dbus" ,dbus) + ("eudev" ,eudev) + ("expat" ,expat) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("gcc:lib" ,gcc-13 "lib") + ("gcc-toolchain" ,gcc-toolchain-13) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("libdrm" ,libdrm) + ("libnotify" ,libnotify) + ("librsvg" ,librsvg) + ("libsecret" ,libsecret) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("libxcomposite" ,libxcomposite) + ("libxcursor" ,libxcursor) + ("libxdamage" ,libxdamage) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxi" ,libxi) + ("libxkbcommon" ,libxkbcommon) + ("libxkbfile" ,libxkbfile) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxshmfence" ,libxshmfence) + ("libxtst" ,libxtst) + ("mesa" ,mesa) + ("mit-krb5" ,mit-krb5) + ("nspr" ,nspr) + ("nss" ,nss) + ("pango" ,pango) + ("pulseaudio" ,pulseaudio) + ("pipewire", pipewire) + ("sqlcipher" ,sqlcipher) + ("xcb-util" ,xcb-util) + ("xcb-util-image" ,xcb-util-image) + ("xcb-util-keysyms" ,xcb-util-keysyms) + ("xcb-util-renderutil" ,xcb-util-renderutil) + ("xcb-util-wm" ,xcb-util-wm) + ("zlib" ,zlib) + + ;; Keep the standard inputs of 'gnu-build-system'. + ,@(standard-packages)))))) - (display lower*) + (lambda _ + (display (lower* (host-inputs)))) + (build-system (inherit bs) (lower lower*)) @@ -71,7 +123,7 @@ (sha256 (base32 "03nnz0mvb1pdv12qdrh3vk243dk3f97dh3b5lh7kmmbbh2bxdhh7")))) (supported-systems '("x86_64-linux")) - (build-system (aggressively-purge-old-gcc chromium-binary-build-system `(("gcc-toolchain-13" ,gcc-toolchain-13)) )) + (build-system (use-modern-gcc-on-chromium-binary chromium-binary-build-system)) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files @@ -113,20 +165,13 @@ `("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 "libnotify") "/lib") - ;(string-append #$(this-package-input "libxkbfile") "/lib") (string-append #$(this-package-input "pipewire") "/lib") - ;(string-append #$(this-package-input "sqlcipher") "/lib") - ;(string-append #$(this-package-input "zlib") "/lib") (string-append #$output "/lib/Vesktop") ;(string-append #$(this-package-input "gcc-toolchain") "/lib") ) ":")))))) ))) - -(inputs (list pipewire)) +(inputs (list pipewire gcc-toolchain-13 gcc-13)) (native-inputs (list tar xz patchelf)) (home-page "https://github.com/Vencord/Vesktop") (synopsis "Discord experience with Vencord pre-installed") @@ -135,4 +180,4 @@ ;; not working? (properties '((release-monitoring-url . "https://github.com/Vencord/Vesktop/releases"))) -(license gpl3))) +(license license:gpl3))) |