From da2128cb405f9f517e68a36973f4a92b08de35fb Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 5 Oct 2024 19:09:03 +0100 Subject: [PATCH] darwin.patch_cmds: remove code for macOS < 11 --- .../darwin/apple-source-releases/patch_cmds/meson.build.in | 4 ---- .../darwin/apple-source-releases/patch_cmds/package.nix | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in index 731c60420a12..9d657d702b7d 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in +++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/meson.build.in @@ -8,7 +8,6 @@ project('patch_cmds', 'c', version : '@version@') # Dependencies cc = meson.get_compiler('c') -libbsd = dependency('libbsd-overlay', required : false) libutil = cc.find_library('util') @@ -30,7 +29,6 @@ install_man('cmp/cmp.1') executable( 'diff', - dependencies : [ libbsd ], include_directories : 'diff', install : true, sources : [ @@ -79,7 +77,6 @@ install_man('diffstat/diffstat.1') executable( 'patch', - dependencies : [ libbsd ], include_directories : 'patch', install : true, sources : [ @@ -96,7 +93,6 @@ install_man('patch/patch.1') executable( 'sdiff', - dependencies : [ libbsd ], include_directories : 'sdiff', install : true, sources : [ diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix index 8f1f213ae5c4..86eaba2136e5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix @@ -1,7 +1,6 @@ { lib, apple-sdk, - libbsd, libutil, mkAppleDerivation, pkg-config, @@ -19,10 +18,7 @@ mkAppleDerivation { nativeBuildInputs = [ pkg-config ]; - buildInputs = - [ libutil ] - # diff, patch, and sdiff need `strtonum`, which requires the 11.0 SDK. - ++ lib.optionals (lib.versionOlder (lib.getVersion apple-sdk) "11.0") [ libbsd ]; + buildInputs = [ libutil ]; meta = { description = "BSD patch commands for Darwin";