nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: eolie: Use webkitgtk-2.22. 

* gnu/packages/gnome.scm (eolie)[native-inputs]: Add gcc-7:lib.
[inputs]: Replace webkitgtk with webkitgtk-2.22.
[arguments]: Add "gcc:lib" to the list of libraries to add to
LD_LIBRARY_PATH.  Use invoke.
This commit is contained in:
Mark H Weaver 2018-09-22 19:25:36 -04:00
parent 480d39a600
commit 84b334362e
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/gnome.scm
View File

@ -4104,19 +4104,20 @@ work and the interface is well tested.")
(delete 'configure) (delete 'configure)
(replace 'build (replace 'build
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "meson" "build" (invoke "meson" "build"
"--prefix" (assoc-ref outputs "out"))))) "--prefix" (assoc-ref outputs "out"))))
(replace 'check (replace 'check
(lambda _ (zero? (system* "ninja" "-C" "build" "test")))) (lambda _ (invoke "ninja" "-C" "build" "test")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "ninja" "-C" "build" "install")))) (invoke "ninja" "-C" "build" "install")))
(add-after 'wrap 'wrap-more (add-after 'wrap 'wrap-more
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
;; These libraries must be on LD_LIBRARY_PATH. ;; These libraries must be on LD_LIBRARY_PATH.
(libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret" (libs '("gtkspell3" "webkitgtk" "libsoup" "libsecret"
"atk" "gtk+" "gsettings-desktop-schemas" "atk" "gtk+" "gsettings-desktop-schemas"
"gcc:lib" ; needed b/c webkitgtk is built with gcc-7
"gobject-introspection")) "gobject-introspection"))
(path (string-join (path (string-join
(map (lambda (lib) (map (lambda (lib)
@ -4129,7 +4130,8 @@ work and the interface is well tested.")
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
#t))))) #t)))))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("gcc:lib" ,gcc-7 "lib") ; needed because webkitgtk is built with gcc-7
("intltool" ,intltool)
("itstool" ,itstool) ("itstool" ,itstool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("meson" ,meson-for-build) ("meson" ,meson-for-build)
@ -4149,7 +4151,7 @@ work and the interface is well tested.")
("libsecret" ,libsecret) ("libsecret" ,libsecret)
("gtkspell3" ,gtkspell3) ("gtkspell3" ,gtkspell3)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("webkitgtk" ,webkitgtk))) ("webkitgtk" ,webkitgtk-2.22)))
(home-page "https://wiki.gnome.org/Apps/Eolie") (home-page "https://wiki.gnome.org/Apps/Eolie")
(synopsis "Web browser for GNOME") (synopsis "Web browser for GNOME")
(description (description