diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
| commit | a9429c8f2207841c649438187d6e19046d323a16 (patch) | |
| tree | a06e4b8a87b6a42742cf6750276746a10b6c2139 /gnu/packages/compression.scm | |
| parent | f0136b36ae8c1e9c174043bd50e0e24413c0f345 (diff) | |
| parent | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (diff) | |
Merge branch 'staging' into core-updates.
Diffstat (limited to 'gnu/packages/compression.scm')
| -rw-r--r-- | gnu/packages/compression.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 6b91b51504..ecb1e69328 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -811,8 +811,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 @@ -871,7 +874,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 @@ -2091,7 +2094,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") |