···11+# `xfce.xfce4-dev-tools` {#xfce4-dev-tools}22+33+This setup hook attempts to run `xdt-autogen` in `xdtAutogenPhase`, which is part of `preConfigurePhases`.44+55+[]{#dontUseXdtAutogenPhase} This behavior can be disabled by setting `dontUseXdtAutogenPhase` to `true`.
···101101 [102102 # Zed uses cargo-install to install cargo-about during the script execution.103103 # We provide cargo-about ourselves and can skip this step.104104+ # Until https://github.com/zed-industries/zed/issues/19971 is fixed,105105+ # we also skip any crate for which the license cannot be determined.104106 ./0001-generate-licenses.patch105107 ]106108 ++ lib.optionals stdenv.hostPlatform.isDarwin [···205203 RUSTFLAGS = if withGLES then "--cfg gles" else "";206204 gpu-lib = if withGLES then libglvnd else vulkan-loader;207205208208- # Enable back when https://github.com/zed-industries/zed/issues/19971 is fixed209209- # preBuild = ''210210- # bash script/generate-licenses211211- # '';206206+ preBuild = ''207207+ bash script/generate-licenses208208+ '';212209213210 postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''214211 patchelf --add-rpath ${gpu-lib}/lib $out/libexec/*
+6-6
pkgs/by-name/zo/zoom-us/package.nix
···4949 # and often with different versions. We write them on three lines5050 # like this (rather than using {}) so that the updater script can5151 # find where to edit them.5252- versions.aarch64-darwin = "6.2.3.40682";5353- versions.x86_64-darwin = "6.2.3.40682";5454- versions.x86_64-linux = "6.2.3.2056";5252+ versions.aarch64-darwin = "6.2.5.41699";5353+ versions.x86_64-darwin = "6.2.5.41699";5454+ versions.x86_64-linux = "6.2.5.2440";55555656 srcs = {5757 aarch64-darwin = fetchurl {5858 url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";5959 name = "zoomusInstallerFull.pkg";6060- hash = "sha256-kpncl6ZVs/O2TXtBhZ/2049jJuUdYlIaxtLX3wIfpVE=";6060+ hash = "sha256-GD3WS4O8Xg2EKYS+CirXWHVjNkn3tQ6Ee5u15x218yA=";6161 };6262 x86_64-darwin = fetchurl {6363 url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";6464- hash = "sha256-gB8pM3EYmA5jF2s/XobV5hk71q16x76nG6M20rWatzE=";6464+ hash = "sha256-8yEkB7hpvat33VCxuScsLD+zPKvqeTfK4Wx0vjyA9yY=";6565 };6666 x86_64-linux = fetchurl {6767 url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";6868- hash = "sha256-dEQdyYEGXMwABulPHK3fLgHo0ZMF5BT6RnqzD23Al38=";6868+ hash = "sha256-h+kt+Im0xv1zoLTvE+Ac9sfw1VyoAnvqFThf5/MwjHU=";6969 };7070 };7171
···148148 hash = "sha256-YUyfVkPNB5nfOROV+mu8NklCe7g5cizjsRTTu8GjslA=";149149 };150150151151+ patches = [152152+ # We don’t want to run `/usr/libexec/path_helper` on nix-darwin,153153+ # as it pulls in paths not tracked in the system configuration154154+ # and messes up the order of `$PATH`. Upstream are unfortunately155155+ # unwilling to accept a change for this and have recommended that156156+ # it should be a distro‐specific patch instead.157157+ #158158+ # See:159159+ #160160+ # * <https://github.com/LnL7/nix-darwin/issues/122>161161+ # * <https://github.com/fish-shell/fish-shell/issues/7142>162162+ ./nix-darwin-path.patch163163+ ];164164+151165 # Fix FHS paths in tests152166 postPatch = ''153167 # src/fish_tests.cpp
+12
pkgs/shells/fish/nix-darwin-path.patch
···11+diff --git a/share/config.fish b/share/config.fish22+index d85fd1e185..c564e45b27 10064433+--- a/share/config.fish44++++ b/share/config.fish55+@@ -158,6 +158,7 @@66+ #77+ if status --is-login88+ if command -sq /usr/libexec/path_helper99++ and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE1010+ # Adapt construct_path from the macOS /usr/libexec/path_helper1111+ # executable for fish; see1212+ # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html .
···5353 # Disabled due to exist upstream cases failing 8/15 tests5454 doCheck = false;55555656+ postPatch = ''5757+ # install -s calls the wrong strip program when cross compiling5858+ substituteInPlace \5959+ console/Makefile.in conserver/Makefile.in autologin/Makefile.in contrib/chat/Makefile.in \6060+ --replace-fail "@INSTALL_PROGRAM@ -s" "@INSTALL_PROGRAM@"6161+ '';6262+5663 meta = with lib; {5764 homepage = "https://www.conserver.com/";5865 description = "Application that allows multiple users to watch a serial console at the same time";