guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

21/29: gnu: kio: Adopt a patch from Nix.


From: Hartmut Goebel
Subject: 21/29: gnu: kio: Adopt a patch from Nix.
Date: Fri, 6 Oct 2017 08:15:10 -0400 (EDT)

htgoebel pushed a commit to branch wip-qt-paths
in repository guix.

commit 0c16e09d9e5a7487fc3f57e2e7f24eb2ece39021
Author: Hartmut Goebel <address@hidden>
Date:   Tue Sep 26 10:18:46 2017 +0200

    gnu: kio: Adopt a patch from Nix.
    
    * gnu/package/kde-frameworks.scm (kio)[arguments]
      <#:phases>'patch': New phase.
---
 gnu/packages/kde-frameworks.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6c13e46..50ed439 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2445,6 +2445,14 @@ makes starting KDE applications faster and reduces 
memory consumption.")
      `(#:tests? #f ; FIXME: 41/50 tests fail.
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'patch
+           (lambda _
+             ;; Better error message (taken from nix)
+             (substitute* "src/kiod/kiod_main.cpp"
+               (("(^\\s*qCWarning(KIOD_CATEGORY) << \"Error loading 
plugin:\")( << loader.errorString();)" _ a b)
+                (string-append a "<< name" b)))
+             ;; TODO: samba-search-path.patch from nix: search smbd on $PATH
+             #t))
          (add-before 'check 'check-setup
            (lambda _
              (setenv "HOME" (getcwd))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]