Merge pull request #222347 from midchildan/feat/syncthing/darwin-codesign

This commit is contained in:
Bernardo Meurer 2023-03-28 09:23:31 -03:00 committed by GitHub
commit b2cb194047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions

View file

@ -1,4 +1,13 @@
{ pkgsBuildBuild, go, buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }:
{ pkgsBuildBuild
, go
, buildGoModule
, stdenv
, lib
, procps
, fetchFromGitHub
, nixosTests
, autoSignDarwinBinariesHook
}:
let
common = { stname, target, postInstall ? "" }:
@ -15,6 +24,15 @@ let
vendorHash = "sha256-5NgflkRXkbWiIkASmxIgWliE8sF89HtlMtlIF+5u6Ic=";
nativeBuildInputs = lib.optionals stdenv.isDarwin [
# Recent versions of macOS seem to require binaries to be signed when
# run from Launch Agents/Daemons, even on x86 devices where it has a
# more lax code signing policy compared to Apple Silicon. So just sign
# the binaries on both architectures to make it possible for launchd to
# auto-start Syncthing at login.
autoSignDarwinBinariesHook
];
doCheck = false;
BUILD_USER = "nix";

View file

@ -33622,6 +33622,7 @@ with pkgs;
syncterm = callPackage ../applications/terminal-emulators/syncterm { };
inherit (callPackages ../applications/networking/syncthing {
inherit (darwin) autoSignDarwinBinariesHook;
buildGoModule = buildGo119Module; # go 1.20 build failure
})
syncthing