diff options
| -rw-r--r-- | vesktop.scm | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/vesktop.scm b/vesktop.scm index 040192a..fe6feae 100644 --- a/vesktop.scm +++ b/vesktop.scm @@ -18,8 +18,10 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (gnu packages elf) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix build-system) #:use-module (guix utils) #:use-module (guix licenses) #:use-module (guix packages) @@ -28,17 +30,38 @@ #:use-module (nonguix build-system chromium-binary) #:use-module (nonguix licenses) #:use-module (ice-9 match) + #:use-module (srfi srfi-1) ) +(define (aggressively-purge-old-gcc bs toolchain) +"Based on guix build-system build-system-with-c-toolchain" + + (define lower + (build-system-lower bs)) -(define use-more-recent-toolchain - (options->transformation - '((with-version . "gcc-toolchain-11=gcc-toolchain-13")))) + (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))))) + + (display lower*) + (build-system + (inherit bs) + (lower lower*)) + ) (define-public vesktop (package (name "vesktop-bin") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) @@ -46,9 +69,9 @@ (string-append "https://github.com/Vencord/Vesktop/releases/download/v" version "/vesktop_" version "_amd64.deb")) (sha256 - (base32 "0clrmd7m2izwaq2apvjm5i7dh38aifmaxpsqa59c5gzxar0i8kg6")))) + (base32 "03nnz0mvb1pdv12qdrh3vk243dk3f97dh3b5lh7kmmbbh2bxdhh7")))) (supported-systems '("x86_64-linux")) - (build-system (use-more-recent-toolchain chromium-binary-build-system)) + (build-system (aggressively-purge-old-gcc chromium-binary-build-system `(("gcc-toolchain-13" ,gcc-toolchain-13)) )) (arguments (list #:validate-runpath? #f ; TODO: fails on wrapped binary and included other files @@ -98,13 +121,13 @@ ;(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") + ;(string-append #$(this-package-input "gcc-toolchain") "/lib") ) ":")))))) ))) -(inputs (list pipewire gcc-toolchain-13)) -(native-inputs (list tar gcc)) +(inputs (list pipewire)) +(native-inputs (list tar xz patchelf)) (home-page "https://github.com/Vencord/Vesktop") (synopsis "Discord experience with Vencord pre-installed") (description "Vesktop is a cross platform desktop app aiming to give |