From 2a954a4181f0f5f6a764c16d4cdc3eea61811246 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Sat, 3 Oct 2020 13:46:43 +0800
Subject: [PATCH] nongnu: firefox: Use absolute filename for symlink target of
 icons.

* nongnu/packages/mozilla.scm (firefox)[arguments]: In install-desktop-entry
phase, use absolute name file for symlink target of icons.

Revert e3c50e1385cc70f2c74aa6dad85c76ed513aa483.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
---
 nongnu/packages/mozilla.scm | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index 1861d28..9a1e04c 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -324,8 +324,7 @@
                     (applications (string-append out "/share/applications")))
                (substitute* desktop-file
                  (("^Exec=firefox") (string-append "Exec=" out "/bin/firefox"))
-                 (("^Icon=.*") (string-append "Icon=" out
-                   "/lib/firefox/browser/chrome/icons/default/default128.png\n"))
+                 (("Icon=.*") "Icon=firefox\n")
                  (("NewWindow") "new-window")
                  (("NewPrivateWindow") "new-private-window"))
                (install-file desktop-file applications))
@@ -336,16 +335,16 @@
                     (icon-source-dir
                      (string-append
                       out "/lib/firefox/browser/chrome/icons/default")))
-               (with-directory-excursion icon-source-dir
-                 (for-each
-                  (lambda (size)
-                    (let ((dest (string-append out "/share/icons/hicolor/"
-                                               size "x" size "/apps")))
-                      (mkdir-p dest)
-                      (symlink (string-append "default" size ".png")
-                               (string-append dest "/firefox.png"))))
-                  '("16" "32" "48" "64" "128"))
-                 #t)))))
+               (for-each
+                (lambda (size)
+                  (let ((dest (string-append out "/share/icons/hicolor/"
+                                             size "x" size "/apps")))
+                    (mkdir-p dest)
+                    (symlink (string-append icon-source-dir
+                                            "/default" size ".png")
+                             (string-append dest "/firefox.png"))))
+                '("16" "32" "48" "64" "128"))
+               #t))))
 
        ;; Test will significantly increase build time but with little rewards.
        #:tests? #f