From 2348fd0f51b6eeabde2e384ef495b3a0adbd6bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 1 Oct 2014 22:11:45 +0200
Subject: [PATCH] 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.
---
 guix/build-system/cmake.scm   | 2 --
 guix/build-system/gnu.scm     | 4 ----
 guix/build-system/perl.scm    | 2 --
 guix/build-system/python.scm  | 2 --
 guix/build-system/ruby.scm    | 2 --
 guix/build-system/trivial.scm | 2 --
 6 files changed, 14 deletions(-)

diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm
index 5673ad5aebe76254bce37365da9c1b73d8da2f88..5e7fba0ac3d69848ae4db1526142eae010e687f7 100644
--- a/guix/build-system/cmake.scm
+++ b/guix/build-system/cmake.scm
@@ -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)))
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 7c9b6ca398f9258542e8ecdb97c9c4ff3821cdd5..372ad14b7194c580ac13a550c68549c4ed3ca6fd 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -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)))
diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm
index 993cd7448eb498ab0cc6972cdbcf80297bb89281..600e597ce863d59cadb142c5f29028d63bb53810 100644
--- a/guix/build-system/perl.scm
+++ b/guix/build-system/perl.scm
@@ -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)))
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm
index dfb8b4a137b24c76f1626c2c4b1054eb88dea87d..a90e7ff511904b879595c14d96bb021305d5c852 100644
--- a/guix/build-system/python.scm
+++ b/guix/build-system/python.scm
@@ -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)))
diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm
index f20967a6199549af9523aa979adbdfbb0bfdbe6c..426ca3718c7ca3d34d8f27f2d02b92d1ed5a6b2c 100644
--- a/guix/build-system/ruby.scm
+++ b/guix/build-system/ruby.scm
@@ -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)))
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index 475e8563e5147cec404c61c8f093ca58994e4c32..897c5c615271293ec2cc05ca46b2b943bd74e5af 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -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)))