diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-04-12 14:27:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-12 14:27:00 -0500 |
| commit | 29bc5237333663b8cd2e8ed97b37dae84f26f150 (patch) | |
| tree | 1a4c8b23554738e0e697cf1b5f4c98c0773bae46 /pkgs/tools | |
| parent | 39da015578c3b28e6f4d030d43937af759212383 (diff) | |
| parent | 59bcd129e5a89dfcc49703de4499d9d83ed4305b (diff) | |
| download | nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar.gz nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar.bz2 nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar.lz nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar.xz nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.tar.zst nixpkgs-29bc5237333663b8cd2e8ed97b37dae84f26f150.zip | |
Merge pull request #38865 from matthewbauer/darwin-security-fixes
[darwin] Security fixes
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/pbzx/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/tools/misc/contacts/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/security/pinentry-mac/default.nix | 2 |
3 files changed, 29 insertions, 2 deletions
diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix new file mode 100644 index 00000000000..bbba21f2b34 --- /dev/null +++ b/pkgs/tools/compression/pbzx/default.nix @@ -0,0 +1,27 @@ +{stdenv, lib, fetchFromGitHub, lzma, xar}: + +stdenv.mkDerivation rec { + pname = "pbzx"; + version = "1.0.2"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "NiklasRosenstein"; + repo = "pbzx"; + rev = "v${version}"; + sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; + }; + buildInputs = [ lzma xar ]; + buildPhase = '' + cc pbzx.c -llzma -lxar -o pbzx + ''; + installPhase = '' + mkdir -p $out/bin + cp pbzx $out/bin + ''; + meta = with lib; { + description = "Stream parser of Apple's pbzx compression format."; + platforms = platforms.unix; + license = licenses.gpl3; + maintainers = [ maintainers.matthewbauer ]; + }; +} diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index d146cd93343..47a74e84b55 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ./contacts-*/Build/Products/Default/contacts $out/bin + cp Products/Default/contacts $out/bin ''; ## FIXME: the framework setup hook isn't adding these correctly diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix index 074d71c0830..2be8550fb4c 100644 --- a/pkgs/tools/security/pinentry-mac/default.nix +++ b/pkgs/tools/security/pinentry-mac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/Applications - mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications + mv Products/Release/pinentry-mac.app $out/Applications ''; passthru = { |