nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: diffoscope: Adjust native-inputs for architecture limitations. 

* gnu/packages/diffoscope (diffoscope)[native-inputs]: Only add ghc on
  x86_64-linux and i686-linux.
  Only add openjdk and enjarify on x86_64-linux.
This commit is contained in:
Vagrant Cascadian 2019-09-21 15:31:41 -07:00 committed by Vagrant Cascadian
parent 265f30c9c4
commit aaeb2b34cb
No known key found for this signature in database
GPG Key ID: DC518FC87F9716AA
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/diffoscope.scm
View File

@ -63,7 +63,8 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils)
#:use-module (ice-9 match))
(define-public diffoscope (define-public diffoscope
(let ((version "125")) (let ((version "125"))
@ -165,6 +166,22 @@
("python-chardet" ,python-chardet) ("python-chardet" ,python-chardet)
("python-binwalk" ,python-binwalk) ("python-binwalk" ,python-binwalk)
;; test suite skips tests when tool is missing ;; test suite skips tests when tool is missing
,@(match (%current-system)
;; ghc is only available on x86 currently.
((or "x86_64-linux" "i686-linux")
`(("ghc" ,ghc)))
(_
`()))
,@(match (%current-system)
;; openjdk and dependent packages are only
;; available on x86_64 currently.
((or "x86_64-linux")
`(("enjarify" ,enjarify)
;; no unversioned openjdk available
("openjdk:jdk" ,openjdk12 "jdk")
))
(_
`()))
("abootimg" ,abootimg) ("abootimg" ,abootimg)
("bdb" ,bdb) ("bdb" ,bdb)
("binutils" ,binutils) ("binutils" ,binutils)
@ -175,10 +192,8 @@
("docx2txt" ,docx2txt) ("docx2txt" ,docx2txt)
("dtc" ,dtc) ("dtc" ,dtc)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("enjarify" ,enjarify)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("ghc" ,ghc)
("ghostscript" ,ghostscript) ("ghostscript" ,ghostscript)
("giflib:bin" ,giflib "bin") ("giflib:bin" ,giflib "bin")
("gnumeric" ,gnumeric) ("gnumeric" ,gnumeric)
@ -190,8 +205,6 @@
("mono" ,mono) ("mono" ,mono)
("ocaml" ,ocaml) ("ocaml" ,ocaml)
("odt2txt" ,odt2txt) ("odt2txt" ,odt2txt)
;; no unversioned openjdk available
("openjdk:jdk" ,openjdk12 "jdk")
("openssh" ,openssh) ("openssh" ,openssh)
("pgpdump" ,pgpdump) ("pgpdump" ,pgpdump)
("poppler" ,poppler) ("poppler" ,poppler)