darwin.libiconv: remove and add to darwin-aliases

+11 -51
+2 -1
pkgs/applications/editors/vim/macvim.nix
··· 11 11 , perl 12 12 , luajit 13 13 , darwin 14 + , libiconv 14 15 , python3 15 16 }: 16 17 ··· 127 128 --replace " -L${stdenv.cc.libc}/lib" "" \ 128 129 --replace " -L${darwin.libobjc}/lib" "" \ 129 130 --replace " -L${darwin.libunwind}/lib" "" \ 130 - --replace " -L${darwin.libiconv}/lib" "" 131 + --replace " -L${libiconv}/lib" "" 131 132 132 133 # All the libraries we stripped have -osx- in their name as of this time. 133 134 # Assert now that this pattern no longer appears in config.mk.
+2 -1
pkgs/by-name/fr/frankenphp/package.nix
··· 7 7 , testers 8 8 , frankenphp 9 9 , darwin 10 + , libiconv 10 11 , pkg-config 11 12 , makeBinaryWrapper 12 13 , runCommand ··· 64 65 '' + lib.optionalString stdenv.isDarwin '' 65 66 # replace hard-code homebrew path 66 67 substituteInPlace ../frankenphp.go \ 67 - --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${darwin.libiconv}/lib" 68 + --replace "-L/opt/homebrew/opt/libiconv/lib" "-L${libiconv}/lib" 68 69 ''; 69 70 70 71 preFixup = ''
+2 -2
pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
··· 2 2 , stdenv 3 3 , buildPythonPackage 4 4 , cargo 5 - , darwin 5 + , libiconv 6 6 , fetchFromGitHub 7 7 , json-stream 8 8 , json-stream-rs-tokenizer ··· 45 45 ]; 46 46 47 47 buildInputs = lib.optionals stdenv.isDarwin [ 48 - darwin.libiconv 48 + libiconv 49 49 ]; 50 50 51 51 # Tests depend on json-stream, which depends on this package.
-3
pkgs/os-specific/darwin/apple-source-releases/default.nix
··· 11 11 }; 12 12 "osx-10.12.6" = { 13 13 xnu = "3789.70.16"; 14 - libiconv = "50"; 15 14 Libnotify = "165.20.1"; 16 15 objc4 = "709.1"; 17 16 dyld = "433.5"; ··· 38 37 dtrace = "168"; 39 38 xnu = "3248.60.10"; 40 39 libpthread = "138.10.4"; 41 - libiconv = "44"; 42 40 Libnotify = "150.40.1"; 43 41 objc4 = "680"; 44 42 eap8021x = "222.40.1"; ··· 272 270 }; 273 271 libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {}; 274 272 libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {}; 275 - libiconv = applePackage "libiconv" "osx-10.12.6" "sha256-ZzPFkchK3EU95UQUVVrR0t8iilhi/VnIkjjtP6KT2oI=" {}; 276 273 Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {}; 277 274 Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {}; 278 275 Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
-38
pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
··· 1 - { stdenv, appleDerivation, lib 2 - , enableStatic ? stdenv.hostPlatform.isStatic 3 - , enableShared ? !stdenv.hostPlatform.isStatic 4 - }: 5 - 6 - appleDerivation { 7 - postUnpack = "sourceRoot=$sourceRoot/libiconv"; 8 - 9 - preConfigure = lib.optionalString stdenv.hostPlatform.isiOS '' 10 - sed -i 's/darwin\*/ios\*/g' configure libcharset/configure 11 - ''; 12 - 13 - configureFlags = [ 14 - (lib.enableFeature enableStatic "static") 15 - (lib.enableFeature enableShared "shared") 16 - ]; 17 - 18 - postInstall = lib.optionalString enableShared '' 19 - mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib 20 - ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib 21 - 22 - # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs 23 - echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ 24 - -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ 25 - -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ 26 - -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib 27 - ''; 28 - 29 - setupHooks = [ 30 - ../../../../build-support/setup-hooks/role.bash 31 - ../../../../development/libraries/libiconv/setup-hook.sh 32 - ]; 33 - 34 - meta = { 35 - mainProgram = "iconv"; 36 - platforms = lib.platforms.darwin; 37 - }; 38 - }
-1
pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix
··· 27 27 hfs = applePackage' "hfs" "556.41.1" "macos-11.0.1" "0a0s6b12b0q07wslfifna0bj51dml9v098i4crr2m1vivnx4xj75" {}; 28 28 libclosure = applePackage' "libclosure" "78" "macos-11.0.1" "0vf9n0k3m8dbprv1bf45zqg0g43bidy2i5z1v9a826bsf8lv7am7" {}; 29 29 libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {}; 30 - libiconv = applePackage' "libiconv" "59" "macos-11.0.1" "0lwa4brdwm4lvrdnxylzsn1yph4m7csgri2zkc4xb4xiisz32pwp" {}; 31 30 libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {}; 32 31 libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {}; 33 32 libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {};
+4
pkgs/top-level/darwin-aliases.nix
··· 51 51 52 52 builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 53 53 54 + ### L ### 55 + 56 + libiconv = pkgs.libiconv; # 2024-03-27 57 + 54 58 ### I ### 55 59 56 60 insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04
+1 -5
pkgs/top-level/python-packages.nix
··· 2558 2558 cryptodatahub = callPackage ../development/python-modules/cryptodatahub { }; 2559 2559 2560 2560 cryptography = callPackage ../development/python-modules/cryptography { 2561 - inherit (pkgs.darwin) libiconv; 2562 2561 inherit (pkgs.darwin.apple_sdk.frameworks) Security; 2563 2562 }; 2564 2563 ··· 2583 2582 css-html-js-minify = callPackage ../development/python-modules/css-html-js-minify { }; 2584 2583 2585 2584 css-inline = callPackage ../development/python-modules/css-inline { 2586 - inherit (pkgs.darwin) libiconv; 2587 2585 inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; 2588 2586 }; 2589 2587 ··· 11613 11611 11614 11612 pyreaderwriterlock = callPackage ../development/python-modules/pyreaderwriterlock { }; 11615 11613 11616 - pyreadstat = callPackage ../development/python-modules/pyreadstat { 11617 - inherit (pkgs.darwin) libiconv; 11618 - }; 11614 + pyreadstat = callPackage ../development/python-modules/pyreadstat { }; 11619 11615 11620 11616 pyrealsense2 = toPythonModule (pkgs.librealsense.override { 11621 11617 enablePython = true;