fixup! cctools: 973.0.1 -> 1010.6

pkgs/by-name/cc/cctools/meson.build

@@ -110,7 +110,7 @@ libstuff = static_library(
 
 # Binaries
 ar = executable(
- 'ar',
+ '@targetPrefix@ar',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -133,7 +133,7 @@ install_man(
 )
 
 as = executable(
- 'gas',
+ '@targetPrefix@gas',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -227,7 +227,7 @@ as_x86_64 = executable(
 # # ld # excluded because ld64 is built separately
 
 bitcode_strip = executable(
- 'bitcode_strip',
+ '@targetPrefix@bitcode_strip',
  dependencies : [libcodedirectory],
  include_directories : incdirs,
  install : true,
@@ -237,7 +237,7 @@ bitcode_strip = executable(
 install_man('man/bitcode_strip.1')
 
 check_dylib = executable(
- 'check_dylib',
+ '@targetPrefix@check_dylib',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -246,7 +246,7 @@ check_dylib = executable(
 install_man('man/check_dylib.1')
 
 checksyms = executable(
- 'checksyms',
+ '@targetPrefix@checksyms',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -255,7 +255,7 @@ checksyms = executable(
 install_man('man/checksyms.1')
 
 cmpdylib = executable(
- 'cmpdylib',
+ '@targetPrefix@cmpdylib',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -264,7 +264,7 @@ cmpdylib = executable(
 install_man('man/cmpdylib.1')
 
 codesign_allocate = executable(
- 'codesign_allocate',
+ '@targetPrefix@codesign_allocate',
  dependencies : [libcodedirectory],
  include_directories : incdirs,
  install : true,
@@ -274,7 +274,7 @@ codesign_allocate = executable(
 install_man('man/codesign_allocate.1')
 
 ctf_insert = executable(
- 'ctf_insert',
+ '@targetPrefix@ctf_insert',
  dependencies : [libcodedirectory],
  include_directories : [incdirs, 'include/stuff'],
  install : true,
@@ -284,7 +284,7 @@ ctf_insert = executable(
 install_man('man/ctf_insert.1')
 
 depinfo = executable(
- 'depinfo',
+ '@targetPrefix@depinfo',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -293,7 +293,7 @@ depinfo = executable(
 install_man('man/depinfo.1')
 
 diagtest = executable(
- 'diagtest',
+ '@targetPrefix@diagtest',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -302,7 +302,7 @@ diagtest = executable(
 install_man('man/diagtest.1')
 
 gprof = executable(
- 'gprof',
+ '@targetPrefix@gprof',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -323,14 +323,14 @@ install_man('man/gprof.1')
 
 # Not supported on 64-bit architectures
 # indr = executable(
-# 'indr',
+# '@targetPrefix@indr',
 # include_directories : incdirs,
 # sources : ['misc/indr.c']
 # )
 # install_man('man/indr.1')
 
 install_name_tool = executable(
- 'install_name_tool',
+ '@targetPrefix@install_name_tool',
  dependencies : [libcodedirectory],
  include_directories : incdirs,
  install : true,
@@ -340,7 +340,7 @@ install_name_tool = executable(
 install_man('man/install_name_tool.1')
 
 libtool = executable(
- 'libtool',
+ '@targetPrefix@libtool',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -349,7 +349,7 @@ libtool = executable(
 install_man('man/libtool.1')
 
 lipo = executable(
- 'lipo',
+ '@targetPrefix@lipo',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -358,7 +358,7 @@ lipo = executable(
 install_man('man/lipo.1')
 
 mtoc = executable(
- 'mtoc',
+ '@targetPrefix@mtoc',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -367,7 +367,7 @@ mtoc = executable(
 install_man('man/mtoc.1')
 
 mtor = executable(
- 'mtor',
+ '@targetPrefix@mtor',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -376,7 +376,7 @@ mtor = executable(
 install_man('man/mtor.1')
 
 nm = executable(
- 'nm',
+ '@targetPrefix@nm',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -385,7 +385,7 @@ nm = executable(
 install_man('man/nm-classic.1')
 
 nmedit = executable(
- 'nmedit',
+ '@targetPrefix@nmedit',
  c_args : ['-DNMEDIT'],
  dependencies : [libcodedirectory],
  include_directories : incdirs,
@@ -396,7 +396,7 @@ nmedit = executable(
 install_man('man/nmedit.1')
 
 otool = executable(
- 'otool',
+ '@targetPrefix@otool',
  c_args : ['-DEFI_SUPPORT'],
  dependencies : [libcxx],
  include_directories : incdirs,
@@ -426,7 +426,7 @@ otool = executable(
 install_man('man/otool-classic.1')
 
 pagestuff = executable(
- 'pagestuff',
+ '@targetPrefix@pagestuff',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -441,7 +441,7 @@ install_man(
 )
 
 redo_prebinding = executable(
- 'redo_prebinding',
+ '@targetPrefix@redo_prebinding',
  dependencies : [libcodedirectory],
  include_directories : incdirs,
  install : true,
@@ -451,7 +451,7 @@ redo_prebinding = executable(
 install_man('man/redo_prebinding.1')
 
 seg_addr_table = executable(
- 'seg_addr_table',
+ '@targetPrefix@seg_addr_table',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -460,7 +460,7 @@ seg_addr_table = executable(
 install_man('man/seg_addr_table.1')
 
 seg_hack = executable(
- 'seg_hack',
+ '@targetPrefix@seg_hack',
  dependencies : [libcodedirectory],
  include_directories : incdirs,
  install : true,
@@ -469,7 +469,7 @@ seg_hack = executable(
 )
 
 segedit = executable(
- 'segedit',
+ '@targetPrefix@segedit',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -478,7 +478,7 @@ segedit = executable(
 install_man('man/segedit.1',)
 
 size = executable(
- 'size',
+ '@targetPrefix@size',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -487,7 +487,7 @@ size = executable(
 install_man('man/size-classic.1')
 
 strings = executable(
- 'strings',
+ '@targetPrefix@strings',
  include_directories : incdirs,
  install : true,
  link_with : [libstuff],
@@ -496,7 +496,7 @@ strings = executable(
 install_man('man/strings.1')
 
 strip = executable(
- 'strip',
+ '@targetPrefix@strip',
  c_args : ['-DTRIE_SUPPORT'],
  dependencies : [libcodedirectory, libcxx, libprunetrie],
  include_directories : incdirs,
@@ -507,7 +507,7 @@ strip = executable(
 install_man('man/strip.1',)
 
 vtool = executable(
- 'vtool',
+ '@targetPrefix@vtool',
  dependencies : [libcodedirectory],
  include_directories : [incdirs, 'include/stuff'],
  install : true,

pkgs/by-name/cc/cctools/package.nix

@@ -9,7 +9,6 @@
  memstreamHook,
  meson,
  ninja,
- xar,
  gitUpdater,
 }:
 
@@ -66,6 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
 
  postPatch = ''
  substitute ${./meson.build} meson.build \
+ --subst-var-by targetPrefix '${targetPrefix}' \
  --subst-var version
 
  # Make sure as’s clang driver uses clang from nixpkgs and finds the drivers in the store.
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
  mesonFlags = [ (lib.mesonOption "b_ndebug" "if-release") ];
 
  postInstall = ''
- ln -s libtool "$out/bin/ranlib"
+ ln -s ${targetPrefix}libtool "$out/bin/${targetPrefix}ranlib"
  ln -s nm-classic.1 "''${!outputMan}/share/man/man1/nm.1"
  ln -s otool-classic.1 "''${!outputMan}/share/man/man1/otool.1"
  ln -s size-classic.1 "''${!outputMan}/share/man/man1/size.1"
@@ -127,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
  description = "The classic linker for Darwin";
  homepage = "https://opensource.apple.com/releases/";
  license = with lib.licenses; [
- apsl20
+ apple-psl20
  gpl2 # GNU as
  ];
  maintainers = with lib.maintainers; [ reckenrode ];