guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: Don't use the store path in the .desktop file.


From: guix-commits
Subject: 01/02: gnu: Don't use the store path in the .desktop file.
Date: Wed, 20 Feb 2019 02:07:38 -0500 (EST)

efraim pushed a commit to branch master
in repository guix.

commit 2b371f4dd5ddafa0786240b40408ef5c30d7a526
Author: Efraim Flashner <address@hidden>
Date:   Wed Feb 20 09:05:30 2019 +0200

    gnu: Don't use the store path in the .desktop file.
    
    This fixes bug#30228.
    
    * gnu/packages/sync.scm (owncloud-client)[arguments]: Add a custom phase
    to substitute the executable name for the full path to the binary.
    Remove the 'patch-dot-desktop-files phase.
---
 gnu/packages/sync.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index df9f3b0..450e7b7 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -79,7 +79,13 @@
              (substitute* "test/CMakeLists.txt"
                           (("owncloud_add_test\\(Utility \"\"\\)" test)
                            (string-append "#" test)))
-             #t)))
+             #t))
+         (add-after 'unpack 'dont-embed-store-path
+           (lambda _
+             (substitute* "src/common/utility_unix.cpp"
+               (("QCoreApplication::applicationFilePath\\()") "\"owncloud\""))
+             #t))
+         (delete 'patch-dot-desktop-files))
        #:configure-flags '("-DUNIT_TESTING=ON"
                            ;; build without qtwebkit, which causes the
                            ;; package to FTBFS while looking for QWebView.



reply via email to

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