diff options
Diffstat (limited to 'gnu/packages/compression.scm')
-rw-r--r-- | gnu/packages/compression.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8185a6157e..3edaecd951 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Jeff Mickey <j@codemac.net> -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice <me@tobias.gr> @@ -813,8 +813,11 @@ decompression of some loosely related file formats used by Microsoft.") (build-system gnu-build-system) (outputs (list "out" "static")) (native-inputs - (list ;; For tests. - python valgrind)) + (append + (list python) ;; For tests. + (if (member (%current-system) (package-supported-systems valgrind)) + (list valgrind) + '()))) (arguments `(;; Not designed for parallel testing. ;; See https://github.com/lz4/lz4/issues/957#issuecomment-737419821 @@ -873,7 +876,7 @@ time for compression ratio.") "LZO_SUPPORT=1" "LZ4_SUPPORT=1" "ZSTD_SUPPORT=1" - (string-append "INSTALL_DIR=" %output "/bin")) + (string-append "INSTALL_DIR=" (assoc-ref %outputs "out") "/bin")) #:phases (modify-phases %standard-phases (replace 'configure @@ -2093,7 +2096,7 @@ single-member files which can't be decompressed in parallel.") (build-system cmake-build-system) (arguments `(#:tests? #f)) - (inputs (list boost libiconv xz)) + (inputs (list boost xz)) (native-inputs (list pkg-config)) (home-page "https://constexpr.org/innoextract/") (synopsis "Tool for extracting Inno Setup installers") |