diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2023-12-17 08:31:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-17 08:31:04 +0000 |
| commit | 6656501fe7e6797fdb75e9de527b9902bd191af2 (patch) | |
| tree | a4887d3dbb6b96445edfd7d41de88f31f79ca4b0 /pkgs | |
| parent | 43eaeabe5f82d9ca0bc9d5fd9861c1e34b47a9ce (diff) | |
| parent | 63c7c3b74ceab9d29bf11f7f3bf5b83dc8c0eba0 (diff) | |
Merge pull request #274849 from wegank/zpaq-darwin
zpaq, patool: add darwin support
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/patool/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/archivers/zpaq/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/patool/default.nix b/pkgs/development/python-modules/patool/default.nix index 9d31fa9e93ee..d36400970391 100644 --- a/pkgs/development/python-modules/patool/default.nix +++ b/pkgs/development/python-modules/patool/default.nix @@ -1,7 +1,7 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , p7zip , cabextract @@ -60,6 +60,8 @@ buildPythonPackage rec { "test_unzip_file" "test_zip" "test_zip_file" + ] ++ lib.optionals stdenv.isDarwin [ + "test_ar" ]; meta = with lib; { diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 7c394e27d178..6a03b825e902 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "zpaq"; }; } |