From 928f763675d91fdb36597aa99f131a4982446313 Mon Sep 17 00:00:00 2001 From: Nicholas Hassan Date: Thu, 21 Nov 2024 12:54:05 +1030 Subject: [PATCH] duti: update to new darwin SDK pattern Signed-off-by: Nicholas Hassan --- pkgs/os-specific/darwin/duti/default.nix | 28 +++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/darwin/duti/default.nix b/pkgs/os-specific/darwin/duti/default.nix index 87af500e98e4a2..bff40e06711b6f 100644 --- a/pkgs/os-specific/darwin/duti/default.nix +++ b/pkgs/os-specific/darwin/duti/default.nix @@ -1,4 +1,9 @@ -{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}: +{ + stdenv, + lib, + fetchFromGitHub, + autoreconfHook, +}: stdenv.mkDerivation rec { pname = "duti"; @@ -10,15 +15,15 @@ stdenv.mkDerivation rec { sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9"; }; - nativeBuildInputs = [autoreconfHook]; - buildInputs = [ApplicationServices]; - configureFlags = [ - "--with-macosx-sdk=/homeless-shelter" + nativeBuildInputs = [ autoreconfHook ]; - # needed to prevent duti from trying to guess our sdk - # NOTE: this is different than stdenv.hostPlatform.config! - "--host=x86_64-apple-darwin18" - ]; + preConfigure = '' + configureFlagsArray+=( + "--with-macosx-sdk=$SDKROOT" + "--with-macosx-deployment-target=$MACOSX_DEPLOYMENT_TARGET" + "--host=x86_64-apple-darwin18" + ) + ''; meta = with lib; { description = "Command-line tool to select default applications for document types and URL schemes on Mac OS X"; @@ -29,7 +34,10 @@ stdenv.mkDerivation rec { a Microsoft Word document has a UTI of com.microsoft.word.doc. Using duti, the user can change which application acts as the default handler for a given UTI. ''; - maintainers = with maintainers; [matthewbauer n-hass]; + maintainers = with maintainers; [ + matthewbauer + n-hass + ]; platforms = platforms.darwin; license = licenses.publicDomain; homepage = "https://github.com/moretension/duti/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e060ad0a3d7782..ab255d872ce141 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19010,9 +19010,7 @@ with pkgs; compressDrvWeb = callPackage ../build-support/compress-drv/web.nix { }; - duti = callPackage ../os-specific/darwin/duti { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; - }; + duti = callPackage ../os-specific/darwin/duti { }; dnstracer = callPackage ../tools/networking/dnstracer { inherit (darwin) libresolv;