diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-01-08 22:48:13 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-01-08 22:48:13 +0100 |
| commit | 5c780036c595d3817207a08934b3cdb67aa2bd1a (patch) | |
| tree | cae450e80a2a10c499dbf3f786c4fb23bb27356f /pkgs/os-specific/darwin | |
| parent | a823616723c44700a1c976fee77aafb470388e19 (diff) | |
| parent | 3f0fee752d6f5f5d0774cc7d9bcf8491562b453b (diff) | |
| download | nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.gz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.bz2 nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.lz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.xz nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.tar.zst nixpkgs-5c780036c595d3817207a08934b3cdb67aa2bd1a.zip | |
Merge branch 'master' into staging-next
The nss rebuild isn't so small.
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-sdk/frameworks.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index c803bf42187..b5a378cc6ae 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -70,6 +70,7 @@ with frameworks; with libs; { Kernel = [ IOKit ]; LDAP = []; LatentSemanticMapping = [ Carbon ]; + LocalAuthentication = []; MapKit = []; MediaAccessibility = [ CoreGraphics CoreText QuartzCore ]; MediaToolbox = [ AudioToolbox AudioUnit CoreMedia ]; diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index d4f20ede2ef..768ca6cf9c9 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "reattach-to-user-namespace"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz"; - sha256 = "00mjyj8yicrpnlm46rlbkvxgl5381l8xawh7rmjk10p3zrm56jbv"; + sha256 = "0xxxdd26rcplhpvi2vy6crxadk3d1qkq4xry10lwq6dyya2jf6wb"; }; buildFlags = [ "ARCHES=x86_64" ]; |