unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#29755] [PATCH] Fix gourmet
@ 2017-12-17 13:27 Mark Meyer
  0 siblings, 0 replies; only message in thread
From: Mark Meyer @ 2017-12-17 13:27 UTC (permalink / raw)
  To: 29755

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

Hi Guix!
This patch introduces a custom install phase for the gourmet variable,
because the combination of --root=/ and --prefix=/gnu/store/... will
lead to the generated paths in settings.py ending up with no preceding
slash. This means that the base dir in setting py is set to
'gnu/store/...gourmet...' instead of '/gnu/store/...gourmet...'.

This also adds another input to enable a plugin.

This is in response to guix #29227 and should fix the crash that is
observed.

Cheers, Mark

-- 
  Mark Meyer
  mark@ofosos.org

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gourmet-Fix-runtime-failure-and-enhance-plugin.patch --]
[-- Type: text/x-patch; name="0001-gnu-gourmet-Fix-runtime-failure-and-enhance-plugin.patch", Size: 1457 bytes --]

From 3ffb47334201539e66eaf9cba6bd54ed2330e9ee Mon Sep 17 00:00:00 2001
From: Mark Meyer <mark@ofosos.org>
Date: Sun, 17 Dec 2017 14:08:17 +0100
Subject: [PATCH] gnu: gourmet: Fix runtime failure and enhance plugin.

* gnu/packages/nutrition.scm (gourmet)[inputs]: Add python-lxml.
[arguments]: Custom install phase.
---
 gnu/packages/nutrition.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/nutrition.scm b/gnu/packages/nutrition.scm
index 90019f848..0e03253cf 100644
--- a/gnu/packages/nutrition.scm
+++ b/gnu/packages/nutrition.scm
@@ -52,11 +52,18 @@
     (inputs
      `(("pygtk"             ,python2-pygtk)
        ("sqlalchemy"        ,python2-sqlalchemy)
+       ("python-lxml"       ,python2-lxml)
        ("python-pillow"     ,python2-pillow)
        ("elib.intl"         ,python2-elib.intl)))
     (arguments
      `(#:python ,python-2               ;exception and print syntax
-       #:tests? #f))                    ;tests look bitrotted
+       #:tests? #f                      ;tests look bitrotted
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (zero? (system* "python" "setup.py" "install" "--prefix"
+                             (assoc-ref %outputs "out"))))))))
     (home-page "http://thinkle.github.io/gourmet/")
     (synopsis "Recipe organizer")
     (description
-- 
2.15.1


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-12-17 13:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-17 13:27 [bug#29755] [PATCH] Fix gourmet Mark Meyer

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).