~ruther/guix-local

3631e865fa6374550ef44f4e8cac264636099b78 — Maxime Devos 4 years ago 7fb5b4c
gnu: windowmaker: Add 'bash' input for 'wrap-program'.

It is required for cross-compilation.

* gnu/packages/gnustep.scm
(windowmaker): Remove trailing #t.
[inputs]: Add 'bash-minimal'.  Remove labels.  Sort.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Icba4437e459e209cb5af4e00a436d3921fc27957
1 files changed, 14 insertions(+), 15 deletions(-)

M gnu/packages/gnustep.scm
M gnu/packages/gnustep.scm => gnu/packages/gnustep.scm +14 -15
@@ 30,6 30,7 @@
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (gnu packages)
  #:use-module (gnu packages base)
  #:use-module (gnu packages bash)
  #:use-module (gnu packages datastructures)
  #:use-module (gnu packages xorg)
  #:use-module (gnu packages libffcall)


@@ 152,8 153,7 @@ GCC runtime.
               ;; The path to wmsetbg in Guix requires 67 extra characters.
               (substitute* "src/defaults.c"
                 (("len = strlen\\(text\\) \\+ 40;")
                  (string-append "len = strlen(text) + 107;")))
               #t)))
                  (string-append "len = strlen(text) + 107;"))))))
         (add-after 'install 'install-xsession
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))


@@ 171,8 171,7 @@ GCC runtime.
                           (string-map (match-lambda
                                         (#\newline #\space)
                                         (chr chr))
                                       ,synopsis) out))))
             #t))
                                       ,synopsis) out))))))
         (add-after 'install-xsession 'wrap
           (lambda* (#:key outputs #:allow-other-keys)
             (let* ((out (assoc-ref outputs "out"))


@@ 180,18 179,18 @@ GCC runtime.
               ;; In turn, 'wmaker.inst' wants to invoke 'wmmenugen'
               ;; etc., so make sure everything is in $PATH.
               (wrap-program (string-append bin "/wmaker.inst")
                 `("PATH" ":" prefix (,bin)))
               #t))))))
                 `("PATH" ":" prefix (,bin)))))))))
    (inputs
     `(("libxmu" ,libxmu)
       ("libxft" ,libxft)
       ("libx11" ,libx11)
       ("libxinerama" ,libxinerama)
       ("fontconfig" ,fontconfig)
       ("libjpeg" ,libjpeg-turbo)
       ("giflib" ,giflib)
       ("libpng" ,libpng)
       ("libtiff" ,libtiff)))
     (list bash-minimal                 ;for wrap-program
           fontconfig
           giflib
           libjpeg-turbo
           libpng
           libtiff
           libx11
           libxft
           libxinerama
           libxmu))
    (native-inputs
     (list pkg-config))
    (home-page "https://windowmaker.org/")