~ruther/guix-local

c334cf0bb90bdd91cc80aae0dead5e77327e862f — Maxim Cournoyer 6 months ago 6faa102
gnu: flex: Move bison-for-tests input to native inputs.

If it's truly for tests, it ought to be a native inputs.

* gnu/packages/flex.scm (flex) [inputs]: Delete field, moving bison-for-tests...
[native-inputs]: ... here.

Change-Id: I7fa30de00b1a6386d495403a619f412daa9d1ab5
1 files changed, 9 insertions(+), 11 deletions(-)

M gnu/packages/flex.scm
M gnu/packages/flex.scm => gnu/packages/flex.scm +9 -11
@@ 48,16 48,6 @@
                 "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8"))
               (patches (search-patches "flex-fix-make-dependencies.patch")))))
    (build-system gnu-build-system)
    (inputs
     (let ((bison-for-tests
            (package
              (inherit bison)
              (arguments
               ;; Disable tests, since they require flex.
               (substitute-keyword-arguments (package-arguments bison)
                 ((#:tests? _ #f) #f)))
              (inputs (alist-delete "flex" (package-inputs bison))))))
       `(("bison" ,bison-for-tests))))
    (arguments
     (if (or (target-hurd64?) (%current-target-system))
         (list #:configure-flags


@@ 70,7 60,15 @@
         '()))
    ;; m4 is not present in PATH when cross-building
    (native-inputs
     (list help2man m4))
     (let ((bison-for-tests
            (package
              (inherit bison)
              (arguments
               ;; Disable tests, since they require flex.
               (substitute-keyword-arguments (package-arguments bison)
                 ((#:tests? _ #f) #f)))
              (inputs (alist-delete "flex" (package-inputs bison))))))
       (list bison-for-tests help2man m4)))
    (propagated-inputs (list m4))
    (home-page "https://github.com/westes/flex")
    (synopsis "Fast lexical analyser generator")