pyrox.dev
Merge pull request #145130 from marius851000/patoolfix
patool: fix the non-use of hard-coded binary
+4
-5
pkgs/development/python-modules/patool/default.nix
+4
-5
pkgs/development/python-modules/patool/default.nix
···
1
1
{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip,
2
-
unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file,
2
+
cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file,
3
3
gzip, bzip2, xz}:
4
4
5
5
# unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar)
6
+
# it will still use unrar if present in the path
6
7
7
8
let
8
9
compression-utilities = [
9
10
p7zip
10
-
unzip
11
11
gnutar
12
12
cabextract
13
13
zip
14
-
zopfli
15
14
lzip
16
15
zpaq
17
16
gzip
···
34
33
sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy";
35
34
};
36
35
37
-
prePatch = ''
36
+
postPatch = ''
38
37
substituteInPlace patoolib/util.py \
39
-
--replace "path = None" 'path = append_to_path(os.environ["PATH"], "${lib.makeBinPath compression-utilities}")'
38
+
--replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"'
40
39
'';
41
40
42
41
checkInputs = [ pytestCheckHook ] ++ compression-utilities;