duti: update to new darwin SDK pattern

remove old SDK, patch build configure checks

Signed-off-by: Nicholas Hassan <nick@hassan.host>
This commit is contained in:
Nicholas Hassan 2024-11-21 12:54:05 +10:30
parent 7eb0c197fb
commit ed8e72640c
No known key found for this signature in database
GPG Key ID: FC95AB946A781EE7
3 changed files with 46 additions and 13 deletions

View File

@ -0,0 +1,31 @@
diff --git a/Makefile.in b/Makefile.in
index d5c9fda..a596462 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,10 +14,7 @@ DUTI_BUILD_DATE=@build_date@
CC= @CC@
FRAMEWORKS= -framework ApplicationServices -framework CoreFoundation
-OPTOPTS= -isysroot @macosx_sdk@ \
- @macosx_arches@ \
- -mmacosx-version-min=@macosx_dep_target@ \
- @OPTOPTS@
+OPTOPTS= @OPTOPTS@
LIBS= @LIBS@
LDFLAGS= @LDFLAGS@ ${LIBS}
diff --git a/configure.ac b/configure.ac
index 815f395..05caaed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ AC_PROG_CC
AC_PROG_INSTALL
AC_CANONICAL_SYSTEM
-DUTI_CHECK_SDK
-DUTI_CHECK_DEPLOYMENT_TARGET
+#DUTI_CHECK_SDK
+#DUTI_CHECK_DEPLOYMENT_TARGET
# function checks
AC_CHECK_FUNC(strlcpy,have_strlcpy=yes,)

View File

@ -1,4 +1,9 @@
{stdenv, lib, fetchFromGitHub, autoreconfHook, ApplicationServices}:
{
stdenv,
lib,
fetchFromGitHub,
autoreconfHook,
}:
stdenv.mkDerivation rec {
pname = "duti";
@ -10,16 +15,12 @@ stdenv.mkDerivation rec {
sha256 = "1pg4i6ghpib2gy1sqpml7dbnhr1vbr43fs2pqkd09i4w3nmgpic9";
};
nativeBuildInputs = [autoreconfHook];
buildInputs = [ApplicationServices];
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"
patches = [
./buildConfigure.patch
];
nativeBuildInputs = [ autoreconfHook ];
meta = with lib; {
description = "Command-line tool to select default applications for document types and URL schemes on Mac OS X";
longDescription = ''
@ -29,7 +30,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/";

View File

@ -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;