~ruther/guix-local

2348fd0f51b6eeabde2e384ef495b3a0adbd6bfb — Ludovic Courtès 11 years ago 5e11038
build-system: Remove irrelevant special case.

* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove comment
  about case where GUILE is a derivation path.
* guix/build-system/cmake.scm (cmake-build): Remove case where GUILE is
  a derivation path.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
M guix/build-system/cmake.scm => guix/build-system/cmake.scm +0 -2
@@ 98,8 98,6 @@ provides a 'CMakeLists.txt' file as its build system."
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ((and (? string?) (? derivation-path?))
       guile)
      (#f                                         ; the default
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))

M guix/build-system/gnu.scm => guix/build-system/gnu.scm +0 -4
@@ 344,8 344,6 @@ are allowed to refer to."
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ;; ((and (? string?) (? derivation-path?))
      ;;  guile)
      (#f                                         ; the default
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))


@@ 530,8 528,6 @@ platform."
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ;; ((and (? string?) (? derivation-path?))
      ;;  guile)
      (#f                                         ; the default
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))

M guix/build-system/perl.scm => guix/build-system/perl.scm +0 -2
@@ 90,8 90,6 @@ provides a `Makefile.PL' file as its build system."
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ((and (? string?) (? derivation-path?))
       guile)
      (#f                                         ; the default
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))

M guix/build-system/python.scm => guix/build-system/python.scm +0 -2
@@ 138,8 138,6 @@ provides a 'setup.py' file as its build system."
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ((and (? string?) (? derivation-path?))
       guile)
      (#f                                         ; the default
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))

M guix/build-system/ruby.scm => guix/build-system/ruby.scm +0 -2
@@ 77,8 77,6 @@
    (match guile
      ((? package?)
       (package-derivation store guile system))
      ((and (? string?) (? derivation-path?))
       guile)
      (#f
       (let* ((distro (resolve-interface '(gnu packages commencement)))
              (guile  (module-ref distro 'guile-final)))

M guix/build-system/trivial.scm => guix/build-system/trivial.scm +0 -2
@@ 29,8 29,6 @@
  (match guile
    ((? package?)
     (package-derivation store guile system))
    ((and (? string?) (? derivation-path?))
     guile)
    (#f                                         ; the default
     (let* ((distro (resolve-interface '(gnu packages commencement)))
            (guile  (module-ref distro 'guile-final)))