unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Federico Beffa <beffa@ieee.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: Guix-devel <guix-devel@gnu.org>
Subject: Re: [PATCH 4/4] gnu: evince: Add inputs.
Date: Sat, 10 Jan 2015 17:30:29 +0100	[thread overview]
Message-ID: <CAKrPhPPFSaUFQSqdPq53OFHfLcNuUBRpgwnVqsTpCb=cv6EpUw@mail.gmail.com> (raw)
In-Reply-To: <87k31lqmyd.fsf@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

On Sun, Dec 21, 2014 at 12:08 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> OK for adding dconf.  However, I think it will be enough to add
> libcanberra to ‘inputs’, not ‘propagated-inputs’, with the fix I
> suggested just before to have the default sound-theme found.

Please find attached an updated patch.

Regards,
Fede

[-- Attachment #2: 0004-gnu-evince-Add-inputs.patch --]
[-- Type: text/x-patch, Size: 1985 bytes --]

From a64baf91c40e87667f31e96e3512b4b4f0d78573 Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Thu, 18 Dec 2014 21:48:43 +0100
Subject: [PATCH 4/4] gnu: evince: Add inputs.

* gnu/packages/gnome.scm (evince): Add 'dconf' and 'libcanberra' inputs.
  Remove custom phase 'set-mime-search-path which is now handled by
  glib-or-gtk-build-system.
---
 gnu/packages/gnome.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a052be1..85bb5f4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -219,19 +219,7 @@ and keep up to date translations of documentation.")
        ;; FIXME: Tests fail with:
        ;;   ImportError: No module named gi.repository
        ;; Where should that module come from?
-       #:tests? #f
-
-       #:phases (alist-cons-after
-                 'install 'set-mime-search-path
-                 (lambda* (#:key inputs outputs #:allow-other-keys)
-                   ;; Wrap 'evince' so that it knows where MIME info is.
-                   (let ((out  (assoc-ref outputs "out"))
-                         (mime (assoc-ref inputs "shared-mime-info")))
-                     (wrap-program (string-append out "/bin/evince")
-                                   `("XDG_DATA_DIRS" ":" prefix
-                                     ,(list (string-append mime "/share")
-                                            (string-append out "/share"))))))
-                 %standard-phases)))
+       #:tests? #f))
     (inputs
      `(("libspectre" ,libspectre)
        ;; ("djvulibre" ,djvulibre)
@@ -250,7 +238,9 @@ and keep up to date translations of documentation.")
        ("libsm" ,libsm)
        ("libice" ,libice)
        ("shared-mime-info" ,shared-mime-info)
-
+       ("dconf" ,dconf)
+       ("libcanberra" ,libcanberra)
+       
        ;; For tests.
        ("dogtail" ,python2-dogtail)))
     (native-inputs
-- 
1.8.4


  reply	other threads:[~2015-01-10 16:30 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-18 21:22 [PATCH 4/4] gnu: evince: Add inputs Federico Beffa
2014-12-21 11:08 ` Ludovic Courtès
2015-01-10 16:30   ` Federico Beffa [this message]
2015-01-10 21:14     ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAKrPhPPFSaUFQSqdPq53OFHfLcNuUBRpgwnVqsTpCb=cv6EpUw@mail.gmail.com' \
    --to=beffa@ieee.org \
    --cc=guix-devel@gnu.org \
    --cc=ludo@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).