me
/
guix
Archived
1
0
Fork 0
Code

gnu: sawfish: Update to 1.13.0. 

* gnu/packages/sawfish.scm (sawfish): Update to 1.13.0.
[arguments]: Use gexps.
[inputs]: Add gdk-pixbuf-xlib and gmp.

Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
master
Feng Shu 2023-01-26 09:31:24 +08:00 committed by 宋文武
parent 3a5937d240
commit 09ffaaa436
No known key found for this signature in database
GPG Key ID: D415BF253B515976
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
gnu/packages/sawfish.scm
View File

@ -21,6 +21,7 @@
(define-module (gnu packages sawfish) (define-module (gnu packages sawfish)
#:use-module ((guix licenses) #:select (gpl2+)) #:use-module ((guix licenses) #:select (gpl2+))
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -113,14 +114,14 @@ backend of Sawfish.")
(define-public sawfish (define-public sawfish
(package (package
(name "sawfish") (name "sawfish")
(version "1.12.0") (version "1.13.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.tuxfamily.org/sawfish/" (uri (string-append "https://download.tuxfamily.org/sawfish/"
name "_" version ".tar.xz")) name "_" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1z7awzgw8d15aw17kpbj460pcxq8l2rhkaxk47w7yg9qrmg0xja4")) "0pdgf9w5vrn3kfqxwggikj4yqg82rpy8ji613zdhidacz9dkqsw1"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -131,44 +132,44 @@ backend of Sawfish.")
"REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):")) "REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):"))
(substitute* "src/Makefile.in" (substitute* "src/Makefile.in"
;; Install libraries for librep to $out/lib/rep. ;; Install libraries for librep to $out/lib/rep.
(("\\$\\(repexecdir\\)") "$(libdir)/rep")) (("\\$\\(repexecdir\\)") "$(libdir)/rep"))))))
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:tests? #f ; no tests (list
#:phases #:tests? #f ; no tests
(modify-phases %standard-phases #:phases
(add-before 'configure 'patch-exec-rep #~(modify-phases %standard-phases
(lambda _ (add-before 'configure 'patch-exec-rep
(substitute* '("lisp/sawfish/cfg/main.jl.in" (lambda _
"scripts/sawfish-about.jl.in" (substitute* '("lisp/sawfish/cfg/main.jl.in"
"scripts/sawfish-client.jl" "scripts/sawfish-about.jl.in"
"scripts/sawfish-menu.jl") "scripts/sawfish-client.jl"
(("exec rep") (string-append "exec " (which "rep")))) "scripts/sawfish-menu.jl")
#t)) (("exec rep") (string-append "exec " (which "rep"))))))
(add-after 'install 'wrap-scripts (add-after 'install 'wrap-scripts
;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk ;; Wrap scripts with REP_DL_LOAD_PATH for finding rep-gtk
;; and sawfish.client. ;; and sawfish.client.
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(define (wrap-script script) (define (wrap-script script)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out script) (wrap-program (string-append out script)
`("REP_DL_LOAD_PATH" = `("REP_DL_LOAD_PATH" =
,(list (getenv "REP_DL_LOAD_PATH") ,(list (getenv "REP_DL_LOAD_PATH")
(string-append out "/lib/rep")))))) (string-append out "/lib/rep"))))))
(for-each wrap-script (for-each wrap-script
(list "/bin/sawfish-about" (list "/bin/sawfish-about"
"/bin/sawfish-client" "/bin/sawfish-client"
"/bin/sawfish-config" "/bin/sawfish-config"
"/lib/sawfish/sawfish-menu")) "/lib/sawfish/sawfish-menu")))))))
#t)))))
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) (list gettext-minimal
("makeinfo" ,texinfo) texinfo
("pkg-config" ,pkg-config) pkg-config
("which" ,which))) which))
(inputs (inputs
(list libsm (list gdk-pixbuf-xlib
gmp
libsm
libxft libxft
libxinerama libxinerama
libxrandr libxrandr