From patchwork Tue Jun 2 01:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 22517 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 1735F27BBE3; Tue, 2 Jun 2020 02:29:28 +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_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 ESMTP id C724C27BBE1 for ; Tue, 2 Jun 2020 02:29:27 +0100 (BST) Received: from localhost ([::1]:36558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jfvk7-0000EM-Ce for patchwork@mira.cbaines.net; Mon, 01 Jun 2020 21:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jfvji-0008Qi-P4 for guix-patches@gnu.org; Mon, 01 Jun 2020 21:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54142) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jfvji-00083k-G4 for guix-patches@gnu.org; Mon, 01 Jun 2020 21:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jfvji-0007ql-Cy for guix-patches@gnu.org; Mon, 01 Jun 2020 21:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41293] [PATCH 1/3] gnu: Add sideload. Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jun 2020 01:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41293 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 41293@debbugs.gnu.org Received: via spool by 41293-submit@debbugs.gnu.org id=B41293.159106129330084 (code B ref 41293); Tue, 02 Jun 2020 01:29:02 +0000 Received: (at 41293) by debbugs.gnu.org; 2 Jun 2020 01:28:13 +0000 Received: from localhost ([127.0.0.1]:37448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfviu-0007pA-Tb for submit@debbugs.gnu.org; Mon, 01 Jun 2020 21:28:13 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:35829) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jfvit-0007om-GT for 41293@debbugs.gnu.org; Mon, 01 Jun 2020 21:28:12 -0400 Date: Tue, 02 Jun 2020 01:27:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1591061285; bh=3V/UV4ZzGJVAeJTWOiMlT8RvAtJ2DXcQeLzkP7MJ2+s=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=EHikrSyK5tzuqM1jIUyO6o5CEb12zrFSq4DO17fNajpkiCUq9bdW52jlc6RbJ/FYW rCPC65AAY1IJI7JILZxxjO4zQP7oeU/isrhmT7ZEOMyKjCw0LJj/yuPydFNVIxz8rk gTpGsa/fmXnYqLMTLMQxQvIQHuk2dmsL5KKsbfJg= Message-ID: <20200602012736.4292-2-rprior@protonmail.com> In-Reply-To: <20200602012736.4292-1-rprior@protonmail.com> References: <20200602012736.4292-1-rprior@protonmail.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" Reply-to: Ryan Prior , Ryan Prior via Guix-patches X-Patchwork-Original-From: Ryan Prior via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pantheon.scm (sideload): New variable. --- gnu/packages/pantheon.scm | 60 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 72910e5470..6709cd2d8a 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -18,11 +18,14 @@ (define-module (gnu packages pantheon) #:use-module (gnu packages cmake) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages package-management) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xml) #:use-module (gnu packages) #:use-module (guix build-system meson) #:use-module (guix git-download) @@ -107,3 +110,60 @@ in apps built for the Pantheon desktop.") arithmetic. It is the default calculator application in the Pantheon desktop.") (license license:gpl3))) + +(define-public sideload + (package + (name "sideload") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elementary/sideload.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mlc3nm2navzxm8k1rwpbw4w6mv30lmhqybm8jqxd4v8x7my73vq")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:configure-flags (list (string-append "-Dflatpak=" + (assoc-ref %build-inputs "flatpak") + "/include")) + #:phases + (modify-phases %standard-phases + (add-before 'install 'set-environment-variables + (lambda _ + ;; Disable compiling schemas and updating desktop databases + (setenv "DESTDIR" "/") + #t)) + (add-after 'install 'install-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/io.elementary.sideload")) + (link (string-append out "/bin/sideload"))) + (symlink bin link))))))) + (inputs + `(("flatpak" ,flatpak) + ("granite" ,granite) + ("gtk" ,gtk+) + ("libostree" ,libostree))) + (propagated-inputs + `(("glib-networking" ,glib-networking))) + (native-inputs + `(("cmake" ,cmake) + ("gettext" ,gettext-minimal) + ("glib" ,glib) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("libgee" ,libgee) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config) + ("vala" ,vala))) + (home-page "https://github.com/elementary/sideload") + (synopsis "Graphical application to side-load Flatpaks") + (description "Sideload handles flatpakref files, like those you might find +on Flathub or another third-party website providing a Flatpak app for +download.") + (license license:gpl3)))