From 46db54706358d84d4bb7eef9a61d28bb2aca7588 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 Dec 2020 16:58:38 -0600 Subject: [PATCH 1/3] duti: 1.5.4pre -> 1.5.5pre This adds changes including support for macOS Big Sur. --- pkgs/os-specific/darwin/duti/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 5c63b8e0dfb..8c523d8a220 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "duti"; - version = "1.5.4pre"; + version = "1.5.5pre"; src = fetchFromGitHub { owner = "moretension"; repo = pname; - rev = "7dbcae86f99fedef5a6c4311f032a0f1ca0539cc"; - sha256 = "1z9sa0yk87vs57d5338y6lvm1v1vvynxb7dy1x5aqzkcr0imhljl"; + rev = "fe3d3dc411bcea6af7a8cbe53c0e08ed5ecacdb2"; + sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9"; }; + nativeBuildInputs = [autoreconfHook]; buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; configureFlags = ["--with-macosx-sdk=/homeless-shelter"]; From c9c3dd4950bcd623c0db83e6ce871e3ce7c3adc2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 29 Dec 2020 16:59:11 -0600 Subject: [PATCH 2/3] duti: set kernel to darwin18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately, we can’t do arm64 multi-arch with the current nixpkgs sdk, which duti assumes if your kernel is darwin20 (Big Sur). To fix this, we can just hardcode to darwin18 which should be compatible with Nixpkgs Darwin. Fixes #105751 --- pkgs/os-specific/darwin/duti/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 8c523d8a220..c56dd20243b 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -12,7 +12,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoreconfHook]; buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; - configureFlags = ["--with-macosx-sdk=/homeless-shelter"]; + configureFlags = [ + "--with-macosx-sdk=/homeless-shelter" + + # needed to prevent duti from trying to guess our sdk + # NOTE: this is different than stdenv.hostPlatform.config! + "--host=x86_64-apple-darwin18" + ]; + meta = with lib; { description = "A command-line tool to select default applications for document types and URL schemes on Mac OS X"; longDescription = '' From dcbbbcdb057a5c0d3c094cd436603b3437866001 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 20 Jan 2021 15:30:57 -0600 Subject: [PATCH 3/3] duti: pass ApplicationServices directly --- pkgs/os-specific/darwin/duti/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index c56dd20243b..9daed151ce4 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -1,4 +1,4 @@ -{stdenv, lib, fetchFromGitHub, autoreconfHook, darwin}: +{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}: stdenv.mkDerivation rec { pname = "duti"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [autoreconfHook]; - buildInputs = [darwin.apple_sdk.frameworks.ApplicationServices]; + buildInputs = [ApplicationServices]; configureFlags = [ "--with-macosx-sdk=/homeless-shelter" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27c565bce0c..a974d61dc88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28908,7 +28908,9 @@ in phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; - duti = callPackage ../os-specific/darwin/duti {}; + duti = callPackage ../os-specific/darwin/duti { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; + }; dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv;