ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: kservice: Transfer patches from NixOS.

Browse source 
Transfer the NixOS patches for kservice as of 2018-02-17.
- Make QDirIterator follow symlinks.
- Normalize path, but don't resolve symlinks.

* gnu/packages/kde-frameworks.scm(kservice)<patch>: New phase.
This commit is contained in:
Hartmut Goebel 2017-10-23 15:15:23 +02:00
parent 0fd6138175
commit fb0356d956
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/kde-frameworks.scm
View file

@ -2979,6 +2979,20 @@ (define-public kservice
`(#:tests? #f ; FIXME: 6/10 tests fail.
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch
;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and
;; "no-canonicalize-path".
(lambda _
(substitute* "src/sycoca/kbuildsycoca.cpp"
;; make QDirIterator follow symlinks
(("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b)
(string-append a " | QDirIterator::FollowSymlinks" b)))
(substitute* "src/sycoca/vfolder_menu.cpp"
;; Normalize path, but don't resolve symlinks (taken from
;; NixOS)
(("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);")
"QString resolved = QDir::cleanPath(dir);"))
#t))
(add-before 'check 'check-setup
(lambda _
(setenv "HOME" (getcwd))