diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-07-28 15:38:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 15:38:04 +0200 |
| commit | 4bfc320c9a53496645c35ac4f4dae15223302e78 (patch) | |
| tree | 84bd0d0c4730f26ea61bac521e1e3694d203a464 /pkgs/development | |
| parent | d905ae22c60cafa7f94938c639d4518e1ddddcfa (diff) | |
| parent | 37e24aecea229e8befcf7fcef64055765673dbf4 (diff) | |
| download | nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar.gz nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar.bz2 nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar.lz nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar.xz nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.tar.zst nixpkgs-4bfc320c9a53496645c35ac4f4dae15223302e78.zip | |
Merge pull request #131812 from prusnak/gcab-unix
gcab/msitools: enable build on darwin
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gcab/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/msitools/default.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index efc533c5504..d0d314037d2 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index ab196ebc5b3..84a9a1135b5 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -59,7 +59,8 @@ stdenv.mkDerivation rec { bzip2 ]; - doCheck = true; + # WiX tests fail on darwin + doCheck = !stdenv.isDarwin; postPatch = '' patchShebangs subprojects/bats-core/{bin,libexec} |