diff options
| author | Marius Bakke <marius@gnu.org> | 2021-12-16 21:10:34 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-12-16 22:21:13 +0100 |
| commit | 1f4319886a9523ee46033f1d28b15f564bab4312 (patch) | |
| tree | 6ce8b8849204bef17d8b656892d8bf7066e17ee7 /gnu/packages/diffoscope.scm | |
| parent | 12c75628b4322853943ae0d0a833e371c02b97f4 (diff) | |
| download | guix-patches-1f4319886a9523ee46033f1d28b15f564bab4312.tar guix-patches-1f4319886a9523ee46033f1d28b15f564bab4312.tar.gz | |
gnu: python-magic: Work around crash on .crx files.
* gnu/packages/patches/python-magic-python-bytecode.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/python-xyz.scm (python-magic)[source](patches): Add it.
[inputs]: Add FILE-NEXT.
[arguments]: While at it, remove input labels.
* gnu/packages/diffoscope.scm (diffoscope)[native-inputs]: Add FILE-NEXT.
Diffstat (limited to 'gnu/packages/diffoscope.scm')
| -rw-r--r-- | gnu/packages/diffoscope.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 696270d506..bfcdf05c9f 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpio) #:use-module (gnu packages dbm) + #:use-module (gnu packages file) ;for 'file-next' #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnome) @@ -184,6 +185,11 @@ ("dtc" ,dtc) ("e2fsprogs" ,e2fsprogs) ("ffmpeg" ,ffmpeg) + + ;; XXX: Must be the same version as python-magic uses; + ;; remove when 'file' is updated. + ("file" ,file-next) + ("fpc" ,fpc) ("gettext" ,gettext-minimal) ("ghostscript" ,ghostscript) |