From patchwork Fri Sep 4 14:40:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rosset X-Patchwork-Id: 23893 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8CE227BBE8; Fri, 4 Sep 2020 15:42:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB34627BBE7 for ; Fri, 4 Sep 2020 15:42:16 +0100 (BST) Received: from localhost ([::1]:38118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kECut-0006I8-Ri for patchwork@mira.cbaines.net; Fri, 04 Sep 2020 10:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kECug-0006H5-Qp for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kECug-0005VQ-ID for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kECug-00064a-GZ for guix-patches@gnu.org; Fri, 04 Sep 2020 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43182] [PATCH 3/3] gnu: nomad: Update to 0.2.0-alpha-100-g6a565d3. Resent-From: Mike Rosset Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Sep 2020 14:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43182@debbugs.gnu.org Cc: Mike Rosset Received: via spool by 43182-submit@debbugs.gnu.org id=B43182.159923049623297 (code B ref 43182); Fri, 04 Sep 2020 14:42:02 +0000 Received: (at 43182) by debbugs.gnu.org; 4 Sep 2020 14:41:36 +0000 Received: from localhost ([127.0.0.1]:40305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECuF-00063c-Na for submit@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:36 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:41203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kECu2-000631-Rl for 43182@debbugs.gnu.org; Fri, 04 Sep 2020 10:41:23 -0400 Received: by mail-pl1-f196.google.com with SMTP id m15so145173pls.8 for <43182@debbugs.gnu.org>; Fri, 04 Sep 2020 07:41:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+CroxZSGgFBJaJviyJ2+tFo8WZampxec0P7KHE/s48A=; b=Wb4lpnNXnyInH3Bt6EsWvKnb+PEXhDweMeZ7TmoH+vS/LhCkRHI4QQRrSpijczW8tq 9Y448SsdNIt8tMbJ+f80xZv+jFmv5Hbhs0z2X1aVQFHrfNam/zybwbwnZeQxHxrJ0/Ov FHzPDmRJb2MCX8IG/TV/LLxJOtXjdEsYVgKl72FmCV0hzY8KG+FdaPEGgj4xDAtskC9r klN85Z5aWSDad4SeVzLE5Id4XSghi2yp5UsoC4H6d42T38o0rhWj0HYeaksvC9+gtPK/ DKtBNGFBldshn4jdAymBF73iigfsgHkbgMi08QTsNv1xqCZuh0q4R31+XHTPpSFES/op 3jgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+CroxZSGgFBJaJviyJ2+tFo8WZampxec0P7KHE/s48A=; b=EHjeYCtiJuC+oPcPmSbUS+YatsiD3RtATqA+X/lmVoNS58nbYGvWyZxo0Wwh3qr9eu Xmh0Oj4RIjpSzdPJ6Qvvdjd+eQyidEUtvMuzN+At7Z0aPyOqitBl6C3g/M+Du0yNMr3i JRUNsRvuejupPLv8ro6z8z1hHdNUvxlYSyF8hauJF117pJknGpYLxpqOAdfWPpK1qm5L 0Nzk+ulS5UchGP1aGSuyYRYaHRh5DcfOMa7Xib5H35+9pAHVjgAHU2YzmtvQ2Md8aaUn eq+VY5cVojJ4x8Ku/629KXej14hkidIoJqvdcBm4hXVcevd28KlKuXx7xR0G9PYIPHvQ 0sSw== X-Gm-Message-State: AOAM533uc/9MZUVki1GRWaxYdf8loHXvp7FW2U5bpVDMMXfnIAwZn0Q7 WleOMiW+FsqG4u5h0x/dXCRzzULqh78= X-Google-Smtp-Source: ABdhPJy2bGhmeAd1gYWO2qbo9JZKNJNqDWMi4RQhZvdHPvOuougtI0uYPmb06QIvN22C/eOy3jKfOQ== X-Received: by 2002:a17:90a:6a0d:: with SMTP id t13mr9067599pjj.208.1599230476724; Fri, 04 Sep 2020 07:41:16 -0700 (PDT) Received: from neutron.hitronhub.home (S010664777da04f43.vf.shawcable.net. [70.68.94.152]) by smtp.gmail.com with ESMTPSA id g129sm6972872pfb.33.2020.09.04.07.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Sep 2020 07:41:16 -0700 (PDT) From: Mike Rosset Date: Fri, 4 Sep 2020 07:40:53 -0700 Message-Id: <20200904144053.1981499-3-mike.rosset@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200904144053.1981499-1-mike.rosset@gmail.com> References: <20200904144053.1981499-1-mike.rosset@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile-xyz.scm (nomad): Update to 0.2.0-alpha-100-g6a565d3. This also removes all propagated inputs and instead uses wrapping for search paths. Wrapping has been simplified and now adds NOMAD_WEB_EXTENSION_DIR, GI_TYPELIB_PATH and GST_PLUGIN_SYSTEM_PATH environment variables. --- gnu/packages/guile-xyz.scm | 92 ++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 53 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5164dc91c5..afe6b9a07c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3074,7 +3074,7 @@ perform geometrical transforms on JPEG images.") (define-public nomad (package (name "nomad") - (version "0.2.0-alpha") + (version "0.2.0-alpha-100-g6a565d3") (source (origin (method git-fetch) (uri (git-reference @@ -3083,7 +3083,7 @@ perform geometrical transforms on JPEG images.") (file-name (git-file-name name version)) (sha256 (base32 - "1z2z5x37v1qrk2vb8qlz2yj030iirzzd0maa9fjxzlqkrg6krbaj")))) + "0anmprm63a88kii251rl296v1g4iq62r6n4nssx5jbc0hzkknanz")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -3094,36 +3094,35 @@ perform geometrical transforms on JPEG images.") ("guile" ,guile-2.2) ("glib:bin" ,glib "bin") ("texinfo" ,texinfo) + ("gettext" ,gnu-gettext) ("perl" ,perl))) (inputs - `(("guile" ,guile-2.2) + `(;; Guile + ("guile" ,guile-2.2) ("guile-lib" ,guile2.2-lib) ("guile-readline" ,guile2.2-readline) ("guile-gcrypt" ,guile2.2-gcrypt) ("gnutls" ,gnutls) + ("g-golf" ,g-golf) ("shroud" ,shroud) ("emacsy" ,emacsy-minimal) + ;; Gtk ("glib" ,glib) ("dbus-glib" ,dbus-glib) + ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") - ("gtksourceview" ,gtksourceview) ("webkitgtk" ,webkitgtk) - ("g-golf" ,g-golf) - ("xorg-server" ,xorg-server))) - (propagated-inputs - `(("glib" ,glib) - ("glib-networking" ,glib-networking) + ("gtksourceview" ,gtksourceview) + ("vte" ,vte) + ;; Gstreamer ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("gst-plugins-good" ,gst-plugins-good) ("gst-plugins-bad" ,gst-plugins-bad) ("gst-plugins-ugly" ,gst-plugins-ugly) - ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview) - ("vte" ,vte) - ("webkitgtk" ,webkitgtk) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas))) + ;; Util + ("xorg-server" ,xorg-server))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) @@ -3141,49 +3140,36 @@ perform geometrical transforms on JPEG images.") #t)) (add-after 'install 'wrap-binaries (lambda* (#:key inputs outputs #:allow-other-keys) - (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* + (let* ((out (assoc-ref outputs "out")) + (effective (read-line (open-pipe* OPEN_READ "guile" "-c" "(display (effective-version))"))) - (deps (map (cut assoc-ref inputs <>) - '("emacsy" "guile-lib" "guile-readline" - "g-golf" "shroud"))) - (scm-path (map (cut string-append <> - "/share/guile/site/" effective) - `(,out ,@deps))) - (go-path (map (cut string-append <> - "/lib/guile/" effective "/site-ccache") - `(,out ,@deps))) - (progs (map (cut string-append out "/bin/" <>) - '("nomad")))) - (map (cut wrap-program <> - `("GIO_EXTRA_MODULES" ":" prefix ,gio-mod-path) - `("GUILE_LOAD_PATH" ":" prefix ,scm-path) - `("GUILE_LOAD_COMPILED_PATH" ":" - prefix ,go-path)) - progs) + (gst-plugins (map (lambda (i) + (string-append (assoc-ref inputs i) + "/lib/gstreamer-1.0")) + `("gstreamer" + "gst-plugins-base" + "gst-plugins-good" + "gst-plugins-bad" + "gst-plugins-ugly"))) + (out-append (lambda (. args) + (apply string-append out args))) + (gi-path (out-append "/lib/girepository-1.0")) + (load-path (out-append "/share/guile/site/" effective)) + (comp-path (out-append "/lib/guile/" effective "/site-ccache")) + (ext-path (out-append "/libexec/nomad"))) + (wrap-program (string-append out "/bin/nomad") + `("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)))))) - (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/") (synopsis "Extensible Web Browser in Guile Scheme") (description "Nomad is a Emacs-like web browser that consists of a modular