ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 13:09:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3.

Browse source 
* gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3.
[source]: Use permanent redirect for source url.
[native-inputs]: Add gnu-gettext.
[inputs]: Add gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad,
gst-plugins-ugly.
[propagated-inputs]: Move to inputs gstreamer, gst-plugins-base, gst-plugins-good,
gst-plugins-bad, gst-plugins-ugly. Removed gsettings-desktop-scheme.
[arguments]: Set GST_PLUGINS_PATH, NOMAD_WEB_EXTENSION_DIR and GI_TYPELIB_PATH
variables in 'wrap-binaries phase.
[native-search-paths]: Remove it.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Mike Rosset 2020-09-07 00:53:37 -07:00 committed by Mathieu Othacehe
parent 83bc416421
commit 0e5a68a271
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 47 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
gnu/packages/guile-xyz.scm
View file

@ -3108,16 +3108,16 @@ (define-public guile-jpeg
(define-public nomad (define-public nomad
(package (package
(name "nomad") (name "nomad")
(version "0.2.0-alpha") (version "0.2.0-alpha-100-g6a565d3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://git.savannah.gnu.org/git/nomad.git") (url "https://git.savannah.gnu.org/git/nomad.git/")
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj")))) "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("autoconf" ,autoconf)
@ -3128,36 +3128,35 @@ (define-public nomad
("guile" ,guile-2.2) ("guile" ,guile-2.2)
("glib:bin" ,glib "bin") ("glib:bin" ,glib "bin")
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("gettext" ,gnu-gettext)
("perl" ,perl))) ("perl" ,perl)))
(inputs (inputs
`(("guile" ,guile-2.2) `(;; Guile
("guile" ,guile-2.2)
("guile-lib" ,guile2.2-lib) ("guile-lib" ,guile2.2-lib)
("guile-readline" ,guile2.2-readline) ("guile-readline" ,guile2.2-readline)
("guile-gcrypt" ,guile2.2-gcrypt) ("guile-gcrypt" ,guile2.2-gcrypt)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("g-golf" ,g-golf)
("shroud" ,shroud) ("shroud" ,shroud)
("emacsy" ,emacsy-minimal) ("emacsy" ,emacsy-minimal)
;; Gtk
("glib" ,glib) ("glib" ,glib)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("glib-networking" ,glib-networking)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("gtk+:bin" ,gtk+ "bin") ("gtk+:bin" ,gtk+ "bin")
("gtksourceview" ,gtksourceview)
("webkitgtk" ,webkitgtk) ("webkitgtk" ,webkitgtk)
("g-golf" ,g-golf) ("gtksourceview" ,gtksourceview)
("xorg-server" ,xorg-server))) ("vte" ,vte)
(propagated-inputs ;; Gstreamer
`(("glib" ,glib)
("glib-networking" ,glib-networking)
("gstreamer" ,gstreamer) ("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good) ("gst-plugins-good" ,gst-plugins-good)
("gst-plugins-bad" ,gst-plugins-bad) ("gst-plugins-bad" ,gst-plugins-bad)
("gst-plugins-ugly" ,gst-plugins-ugly) ("gst-plugins-ugly" ,gst-plugins-ugly)
("gtk+" ,gtk+) ;; Util
("gtksourceview" ,gtksourceview) ("xorg-server" ,xorg-server)))
("vte" ,vte)
("webkitgtk" ,webkitgtk)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(arguments (arguments
`(#:modules ((guix build gnu-build-system) `(#:modules ((guix build gnu-build-system)
(guix build utils) (guix build utils)
@ -3176,48 +3175,39 @@ (define-public nomad
(add-after 'install 'wrap-binaries (add-after 'install 'wrap-binaries
(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"))
(gio-deps (map (cut assoc-ref inputs <>)
'("glib-networking"
"glib"
"gstreamer"
"gst-plugins-base"
"gst-plugins-good"
"gst-plugins-bad"
"gst-plugins-ugly")))
(gio-mod-path (map (cut string-append <>
"/lib/gio/modules")
gio-deps))
(effective (read-line (open-pipe* (effective (read-line (open-pipe*
OPEN_READ OPEN_READ
"guile" "-c" "guile" "-c"
"(display (effective-version))"))) "(display (effective-version))")))
(deps (map (cut assoc-ref inputs <>) (gst-plugins (map (lambda (i)
'("emacsy" "guile-lib" "guile-readline" (string-append (assoc-ref inputs i)
"g-golf" "shroud"))) "/lib/gstreamer-1.0"))
(scm-path (map (cut string-append <> `("gstreamer"
"/share/guile/site/" effective) "gst-plugins-base"
`(,out ,@deps))) "gst-plugins-good"
(go-path (map (cut string-append <> "gst-plugins-bad"
"/lib/guile/" effective "/site-ccache") "gst-plugins-ugly")))
`(,out ,@deps))) (out-append (lambda (. args)
(progs (map (cut string-append out "/bin/" <>) (apply string-append out args)))
'("nomad")))) (gi-path (out-append "/lib/girepository-1.0"))
(map (cut wrap-program <> (load-path (out-append "/share/guile/site/" effective))
`("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path) (comp-path (out-append "/lib/guile/"
`("GUILE_LOAD_PATH" ":" prefix ,scm-path) effective "/site-ccache"))
`("GUILE_LOAD_COMPILED_PATH" ":" (ext-path (out-append "/libexec/nomad")))
prefix ,go-path)) (wrap-program (string-append out "/bin/nomad")
progs) `("GUILE_LOAD_PATH" ":" prefix
(,load-path
,(getenv "GUILE_LOAD_PATH")))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,comp-path
,(getenv "GUILE_LOAD_COMPILED_PATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,gi-path ,(getenv "GI_TYPELIB_PATH")))
`("GIO_EXTRA_MODULES" ":" prefix
(,(getenv "GIO_EXTRA_MODULES")))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix ,gst-plugins)
`("NOMAD_WEB_EXTENSION_DIR" ":" prefix (,ext-path)))
#t)))))) #t))))))
(native-search-paths
(list (search-path-specification
(variable "GI_TYPELIB_PATH")
(separator ":")
(files '("lib/girepository-1.0")))
(search-path-specification
(variable "NOMAD_WEB_EXTENSION_DIR")
(separator ":")
(files '("libexec/nomad")))))
(home-page "https://savannah.nongnu.org/projects/nomad/") (home-page "https://savannah.nongnu.org/projects/nomad/")
(synopsis "Extensible Web Browser in Guile Scheme") (synopsis "Extensible Web Browser in Guile Scheme")
(description "Nomad is a Emacs-like web browser that consists of a modular (description "Nomad is a Emacs-like web browser that consists of a modular