mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge pull request #160018 from Artturin/pythonmagicup
This commit is contained in:
commit
76bbae8262
|
@ -3,7 +3,6 @@
|
|||
, python
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, substituteAll
|
||||
, file
|
||||
, glibcLocales
|
||||
|
@ -11,23 +10,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-magic";
|
||||
version = "0.4.24";
|
||||
version = "0.4.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahupp";
|
||||
repo = "python-magic";
|
||||
rev = version;
|
||||
sha256 = "17jalhjbfd600lzfz296m0nvgp6c7vx1mgz82jbzn8hgdzknf4w0";
|
||||
sha256 = "sha256-h7YQVH5Z7zunT6AdLPBh3TWpxLpZ5unSHDhkVDFOWDI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# pull upstream patch to support file-5.41
|
||||
(fetchpatch {
|
||||
name = "file-5.41-compat.patch";
|
||||
url = "https://github.com/ahupp/python-magic/commit/0ae7e7ceac0e80e03adc75c858bb378c0427331a.patch";
|
||||
sha256 = "0vclaamb56nza1mcy88wjbkh81hnish2gzvl8visa2cknhgdmk50";
|
||||
})
|
||||
|
||||
(substituteAll {
|
||||
src = ./libmagic-path.patch;
|
||||
libmagic = "${file}/lib/libmagic${stdenv.hostPlatform.extensions.sharedLibrary}";
|
||||
|
|
Loading…
Reference in a new issue