Unverified Commit 0861217c authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: replace `stdenv.is` with `stdenv.hostPlatform.is` (#413977)

parents 2648e3fb 97262ee8

nixos/tests/mattermost/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ import ../make-test-python.nix ( 
            shutdown_queue.task_done()

        threading.Thread(target=shutdown_worker, daemon=True).start()



        ${pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''

        ${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''

          # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.

          run_mattermost_tests(

            shutdown_queue,

pkgs/by-name/ac/actual-server/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ stdenv.mkDerivation { 
    mainProgram = "actual-server";

    license = lib.licenses.mit;

    # https://github.com/NixOS/nixpkgs/issues/403846

    broken = stdenv.isDarwin;

    broken = stdenv.hostPlatform.isDarwin;

    maintainers = [

      lib.maintainers.oddlama

      lib.maintainers.patrickdag

pkgs/by-name/ag/age-plugin-se/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  # Can't find libdispatch without this on NixOS. (swift 5.8)

  LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib";

  LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib";



  postPatch =

    let

pkgs/by-name/ak/akkoma-admin-fe/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { 
    python3

    git

    libsass

  ] ++ lib.optional stdenv.isDarwin xcbuild;

  ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;



  configurePhase = ''

    runHook preConfigure

pkgs/by-name/ar/ares-rs/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec { 
    license = licenses.mit;

    maintainers = with maintainers; [ fab ];

    mainProgram = "ares";

    broken = stdenv.isDarwin;

    broken = stdenv.hostPlatform.isDarwin;

  };

}