From 1f4319886a9523ee46033f1d28b15f564bab4312 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 16 Dec 2021 21:10:34 +0100 Subject: 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. --- gnu/packages/diffoscope.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/diffoscope.scm') 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) -- cgit v1.2.3