~ruther/guix-local

08de1612748c58ace7b77deb5859ac9bb89dd2b2 — Liliana Marie Prikler 1 year, 10 months ago 80d364b
gnu: Fix builds that require old blueprint-compiler.

This is a follow-up commit to cee21ef8650d723e9e1ea4c6313897fd3bf64112 and
fixes two builds that rely on an older version of blueprint-compiler.
The giara package remains broken as a result of a test failure.

* gnu/packages/gnome.scm (blueprint-compiler-0.4): New variable.
* gnu/packages/syndication.scm (giara, gfeeds): Replace blueprint-compiler
with blueprint-compiler-0.4.
* gnu/packages/text-editors.scm (textpieces): Likewise
3 files changed, 19 insertions(+), 3 deletions(-)

M gnu/packages/gnome.scm
M gnu/packages/syndication.scm
M gnu/packages/text-editors.scm
M gnu/packages/gnome.scm => gnu/packages/gnome.scm +16 -0
@@ 3320,6 3320,22 @@ compiles to GTKBuilder XML.")
    (home-page "https://gitlab.gnome.org/jwestman/blueprint-compiler")
    (license license:lgpl3+)))

(define-public blueprint-compiler-0.4
  (package
    (inherit blueprint-compiler)
    (name "blueprint-compiler")
    (version "0.4.0")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url
                     "https://gitlab.gnome.org/jwestman/blueprint-compiler")
                    (commit (string-append "v" version))))
              (file-name (string-append name "-" version "-checkout"))
              (sha256
               (base32
                "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy"))))))

(define-public cambalache
  (package
    (name "cambalache")

M gnu/packages/syndication.scm => gnu/packages/syndication.scm +2 -2
@@ 201,7 201,7 @@ cards.")
           (list gtk "bin")
           pkg-config))
    (inputs
     (list blueprint-compiler
     (list blueprint-compiler-0.4
           glib
           gtk
           gtksourceview


@@ 569,7 569,7 @@ parser.  It is \"not fit for use at this point\", but gfeeds uses it anyway.")
                `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))))))))
    (native-inputs
     (list `(,glib "bin")
           blueprint-compiler
           blueprint-compiler-0.4
           gobject-introspection
           gettext-minimal
           pkg-config))

M gnu/packages/text-editors.scm => gnu/packages/text-editors.scm +1 -1
@@ 1065,7 1065,7 @@ Octave.  TeXmacs is completely extensible via Guile.")
    (build-system meson-build-system)
    (native-inputs
     (list appstream-glib
           blueprint-compiler
           blueprint-compiler-0.4
           desktop-file-utils
           gettext-minimal
           `(,glib "bin")