From f2c672a19a73db390dd1ce2a0776636e579841cb Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Sat, 18 Sep 2021 12:00:47 -0400 Subject: [PATCH 1/5] sigtool: 4a3719b4 -> 2a13539d --- pkgs/os-specific/darwin/sigtool/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index 933ef784879f6..e89fa40092585 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -6,19 +6,12 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "thefloweringash"; repo = "sigtool"; - rev = "4a3719b42dc91c3f513df94048851cc98e7c7fcf"; - sha256 = "04ra1cx7k1sdbkj5yrvl0s3l333vpir8rnm8k1dh2zy1w0a6hpqa"; + rev = "2a13539dc4893f39412a3fb810afc78b183df3df"; + sha256 = "sha256-iCsdklN3crFx6CKsMIUP/fA3twLh4ArQh7OsVug5UjE="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ]; installFlags = [ "PREFIX=$(out)" ]; - - # Upstream (me) asserts the driver script is optional. - postInstall = '' - substitute $NIX_BUILD_TOP/$sourceRoot/codesign.sh $out/bin/codesign \ - --replace sigtool "$out/bin/sigtool" - chmod a+x $out/bin/codesign - ''; } From f3a51426345ddec18b8f2339249f83cedeef3e1d Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Tue, 21 Sep 2021 11:17:35 -0400 Subject: [PATCH 2/5] sigtool: remove unnecessary dependencies --- pkgs/os-specific/darwin/sigtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index e89fa40092585..2de7f800dd3cf 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, makeWrapper, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl }: stdenv.mkDerivation { name = "sigtool"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "sha256-iCsdklN3crFx6CKsMIUP/fA3twLh4ArQh7OsVug5UjE="; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; installFlags = [ "PREFIX=$(out)" ]; From bf060b81900ac51c7fa7df8c50a005ed18ba1584 Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Tue, 21 Sep 2021 11:18:17 -0400 Subject: [PATCH 3/5] sigtool: 2a13539d -> 0.1.0 --- pkgs/os-specific/darwin/sigtool/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index 2de7f800dd3cf..a06837fabe121 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, openssl }: -stdenv.mkDerivation { - name = "sigtool"; +stdenv.mkDerivation rec { + pname = "sigtool"; + version = "0.1.0"; src = fetchFromGitHub { owner = "thefloweringash"; repo = "sigtool"; - rev = "2a13539dc4893f39412a3fb810afc78b183df3df"; - sha256 = "sha256-iCsdklN3crFx6CKsMIUP/fA3twLh4ArQh7OsVug5UjE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GSVkF1BkZEkIF+q0SsoCuE0q48DRclE3E+qKc6JEc/0="; }; nativeBuildInputs = [ pkg-config ]; From 0c07b002c395f79508c17f79d61792a36386ec75 Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Tue, 21 Sep 2021 11:19:01 -0400 Subject: [PATCH 4/5] darwin.stdenv: make sigtool updates recommended by @thefloweringash While reviewing NixOS/nixpkgs#138453, @thefloweringash recommended two darwin stdenv edits in the following [gist]: 1. a comment on how to simplify boostrapTools.installPhase in the future and 2. an adjustment for a change made by an earlier commit to change `codesign` from being a shell-script wrapper to native binary. [gist]: https://gist.github.com/thefloweringash/032517aec4e929c41a85efb24b33e16c --- pkgs/stdenv/darwin/default.nix | 6 ++++++ pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index b5a9f0cc5cb9d..81313fb390ec2 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -268,6 +268,12 @@ rec { ${bootstrapTools}/bin/codesign > $out/bin/codesign chmod a+x $out/bin/codesign ''; + # on next bootstrap tools update, use the following: + # installPhase = '' + # mkdir -p $out/bin + # ln -s ${bootstrapTools}/bin/sigtool $out/bin + # ln -s ${bootstrapTools}/bin/codesign $out/bin + # ''; }; print-reexports = stdenv.mkDerivation { diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index c62e72f6047c9..434eadb38bf08 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -206,7 +206,7 @@ in rec { done for i in $out/bin/*; do - if test -x "$i" -a ! -L "$i" -a "$(basename $i)" != codesign; then + if test -x "$i" -a ! -L "$i"; then echo "Adding @executable_path to rpath in $i" ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i fi From 0273a15785b4f49df0a31808b2404319755a1add Mon Sep 17 00:00:00 2001 From: Michael Stone Date: Wed, 22 Sep 2021 13:30:55 -0400 Subject: [PATCH 5/5] sigtool: simplify rev argument Co-authored-by: Sandro --- pkgs/os-specific/darwin/sigtool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/sigtool/default.nix b/pkgs/os-specific/darwin/sigtool/default.nix index a06837fabe121..6c600097f09b2 100644 --- a/pkgs/os-specific/darwin/sigtool/default.nix +++ b/pkgs/os-specific/darwin/sigtool/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "thefloweringash"; repo = "sigtool"; - rev = "refs/tags/v${version}"; + rev = "v${version}"; sha256 = "sha256-GSVkF1BkZEkIF+q0SsoCuE0q48DRclE3E+qKc6JEc/0="; };