TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: lxqt-session: Update to 1.1.1, don't hardcode /run/current-system.

Browse source 
* gnu/packages/lxqt.scm (lxqt-session): Update to 1.1.1.
[inputs]: Add qtxdg-tools, remove libqtxdg.
[arguments]<phases>: Remove patching of LXQT_ETC_XDG_DIR and
LXQT_TRANSLATIONS_DIR.  Remove wrap-program.
[native-search-paths]: Add 'XDG_CONFIG_DIRS'.
This commit is contained in:
宋文武 2022-08-17 10:37:28 +08:00
parent 850cc1cc6b
commit 64678c7228
No known key found for this signature in database
GPG key ID: D415BF253B515976
1 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/lxqt.scm
View file

@ -698,20 +698,20 @@ (define-public lxqt-runner
(define-public lxqt-session
(package
(name "lxqt-session")
(version "0.17.1")
(version "1.1.1")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/lxqt/" name "/releases/download/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32 "0iwwfyngpbhs2dwvbw0cci0bf3qbqcpjjw7h5vm46nimvgp8q1fr"))))
(base32 "0j8q5jfpb2l0vvji3xs8y0jcr792z6sxzj111qqvmdrbpxrkwxnw"))))
(build-system cmake-build-system)
(inputs
(list eudev
kwindowsystem
liblxqt
libqtxdg
qtxdg-tools
procps
qtbase-5
qtsvg-5
@ -725,40 +725,28 @@ (define-public lxqt-session
(modify-phases %standard-phases
(add-after 'unpack 'patch-source
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("autostart/CMakeLists.txt"
"config/CMakeLists.txt")
(("DESTINATION \"\\$\\{LXQT_ETC_XDG_DIR\\}")
"DESTINATION \"etc/xdg"))
(let ((out (assoc-ref outputs "out")))
(substitute* '("xsession/lxqt.desktop.in")
(("Exec=startlxqt") (string-append "Exec=" out "/bin/startlxqt"))
(("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt")))
#t)))
;; add write permission to lxqt-rc.xml file which is stored as read-only in store
(("TryExec=lxqt-session") (string-append "TryExec=" out "/bin/startlxqt"))))))
(add-after 'unpack 'patch-openbox-permission
(lambda _
(substitute* "startlxqt.in"
;; Don't add 'etc/xdg' to XDG_CONFIG_DIRS, and 'share' to XDG_DATA_DIRS.
(("! contains .*;") "false;")
;; Add write permission to lxqt-rc.xml file which is stored as
;; read-only in store.
(("cp \"\\$LXQT_DEFAULT_OPENBOX_CONFIG\" \"\\$XDG_CONFIG_HOME/openbox\"")
(string-append "cp \"$LXQT_DEFAULT_OPENBOX_CONFIG\" \"$XDG_CONFIG_HOME/openbox\"\n"
" # fix openbox permission issue\n"
" chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*")))
#t))
(add-after 'unpack 'patch-translations-dir
(lambda* (#:key outputs #:allow-other-keys)
(substitute* '("lxqt-config-session/CMakeLists.txt"
"lxqt-leave/CMakeLists.txt"
"lxqt-session/CMakeLists.txt")
(("\\$\\{LXQT_TRANSLATIONS_DIR\\}")
(string-append (assoc-ref outputs "out")
"/share/lxqt/translations")))
#t))
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/startlxqt")
`("XDG_CONFIG_DIRS" ":" suffix ("/run/current-system/profile/share"
"/run/current-system/profile/share/pcmanfm-qt")))
#t))))))
" chmod u+w \"$XDG_CONFIG_HOME/openbox\"/*"))))))))
(native-search-paths
(list (search-path-specification
;; LXQt applications install their default config files into
;; 'share/lxqt' and search them from XDG_CONFIG_DIRS/lxqt.
(variable "XDG_CONFIG_DIRS")
(files '("share")))))
(home-page "https://lxqt-project.org")
(synopsis "Session manager for LXQt")
(description "lxqt-session provides the standard session manager