Update Vivaldi.scm
Finishes up patching and wrapping
This commit is contained in:
41
Vivaldi.scm
41
Vivaldi.scm
@@ -75,47 +75,48 @@
|
|||||||
(share (string-append #$output "/share"))
|
(share (string-append #$output "/share"))
|
||||||
(opt "./opt")
|
(opt "./opt")
|
||||||
(usr/share "./usr/share")
|
(usr/share "./usr/share")
|
||||||
(old-exe (string-append "/opt/vivaldi/" #$appname "/vivaldi-" #$appname))
|
(old-exe (string-append "/opt/vivaldi/" #$appname))
|
||||||
(exe (string-append bin "/vivaldi-" #$appname)))
|
(exe (string-append bin "/vivaldi")))
|
||||||
;; This allows us to override CHROME_WRAPPER later.
|
;; This allows us to override CHROME_WRAPPER later.
|
||||||
(substitute* (string-append opt "/vivaldi/" #$appname "/vivaldi-" #$appname)
|
(substitute* (string-append opt "/vivaldi/vivaldi")
|
||||||
(("CHROME_WRAPPER") "WRAPPER"))
|
(("CHROME_WRAPPER") "WRAPPER"))
|
||||||
(substitute* (string-append usr/share "/applications/vivaldi-" #$appname ".desktop")
|
(substitute* (string-append usr/share "/applications/vivaldi-stable.desktop")
|
||||||
(("^Exec=.*") (string-append "Exec=" exe "\n")))
|
(("^Exec=.*") (string-append "Exec=" exe "\n")))
|
||||||
(substitute* (string-append usr/share "/gnome-control-center/default-apps/vivaldi-" #$appname ".xml")
|
;;(substitute* (string-append usr/share "/gnome-control-center/default-apps/vivaldi-" #$appname ".xml")
|
||||||
((old-exe) exe))
|
;; ((old-exe) exe))
|
||||||
(substitute* (string-append usr/share "/menu/vivaldi-" #$appname ".menu")
|
(substitute* (string-append usr/share "/menu/vivaldi" ".menu")
|
||||||
(("/opt") share)
|
(("/opt") share)
|
||||||
((old-exe) exe)))))
|
((old-exe) exe)))))
|
||||||
#!(add-after 'install 'install-icons
|
(add-after 'install 'install-icons
|
||||||
(lambda _
|
(lambda _
|
||||||
(define (format-icon-size name)
|
(define (format-icon-size name)
|
||||||
(car
|
(car
|
||||||
(string-split
|
(string-split
|
||||||
(string-drop-right (string-drop name 13) 4)
|
(string-drop-right (string-drop name 13) 4)
|
||||||
#\_)))
|
#\_)))
|
||||||
(let ((icons (string-append #$output "/usr/share/icons/hicolor"))
|
(let ((icons (string-append #$output "/share/icons/hicolor"))
|
||||||
(share (string-append #$output "/usr/share/vivaldi/" #$appname)))
|
(share (string-append #$output "/share/vivaldi")))
|
||||||
(for-each (lambda (icon)
|
(for-each (lambda (icon)
|
||||||
(let* ((icon-name (basename icon))
|
(let* ((icon-name (basename icon))
|
||||||
(icon-size (format-icon-size icon-name))
|
(icon-size (format-icon-size icon-name))
|
||||||
(target (string-append icons "/" icon-size "x" icon-size "/apps/vivaldi-" #$appname ".png")))
|
(target (string-append icons "/" icon-size "x" icon-size "/apps/" #$appname ".png")))
|
||||||
(mkdir-p (dirname target))
|
(mkdir-p (dirname target))
|
||||||
(rename-file icon target)))
|
(rename-file icon target)))
|
||||||
(find-files share "product_logo_.*\\.png")))))
|
(find-files share "product_logo_.*\\.png")))))
|
||||||
|
|
||||||
(add-before 'install-wrapper 'install-exe
|
(add-before 'install-wrapper 'install-exe
|
||||||
(lambda _
|
(lambda _
|
||||||
(let* ((bin (string-append #$output "/usr/bin"))
|
(let* ((bin (string-append #$output "/bin"))
|
||||||
(exe (string-append bin "/vivaldi-" #$appname "-stable"))
|
(exe (string-append bin "/" #$appname))
|
||||||
(share (string-append #$output "/usr/share"))
|
(share (string-append #$output "/share"))
|
||||||
(edge-target (string-append share "/vivaldi/" #$appname "/vivaldi-" #$appname)))
|
(chromium-target (string-append #$output "/share/vivaldi/" #$appname )))
|
||||||
(mkdir-p bin)
|
(mkdir-p bin)
|
||||||
(symlink edge-target exe)
|
(symlink chromium-target exe)
|
||||||
(wrap-program exe
|
(wrap-program exe
|
||||||
'("CHROME_WRAPPER" = (#$appname))))))
|
'("CHROME_WRAPPER" = (#$appname))
|
||||||
!#
|
))))
|
||||||
(delete 'patch-assets)
|
|
||||||
(delete 'install-wrapper))))
|
)))
|
||||||
(inputs
|
(inputs
|
||||||
(list bzip2
|
(list bzip2
|
||||||
curl
|
curl
|
||||||
|
|||||||
Reference in New Issue
Block a user