Commit 63fa53d9 authored by Artturin's avatar Artturin
Browse files

treewide: reformat files which need reformatting after 

`treewide: replace stdenv.is with stdenv.hostPlatform.is`
parent e0464e47

pkgs/applications/misc/blender/default.nix

+10 −3
Original line number Diff line number Diff line
@@ -84,8 +84,10 @@ 
}:



let

  embreeSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;

  openImageDenoiseSupport = (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;

  embreeSupport =

    (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;

  openImageDenoiseSupport =

    (!stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) || stdenv.hostPlatform.isDarwin;

  openUsdSupport = !stdenv.hostPlatform.isDarwin;



  python3 = python3Packages.python;
@@ -328,7 +330,12 @@ stdenv.mkDerivation (finalAttrs: { 


  blenderExecutable =

    placeholder "out"

    + (if stdenv.hostPlatform.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender");

    + (

      if stdenv.hostPlatform.isDarwin then

        "/Applications/Blender.app/Contents/MacOS/Blender"

      else

        "/bin/blender"

    );



  postInstall =

    lib.optionalString stdenv.hostPlatform.isDarwin ''

pkgs/applications/misc/zathura/core/default.nix

+15 −12
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ stdenv.mkDerivation (finalAttrs: { 
    appstream-glib

  ];



  buildInputs = [

  buildInputs =

    [

      gtk

      girara

      libintl
@@ -90,7 +91,9 @@ stdenv.mkDerivation (finalAttrs: { 
      check

      json-glib

      texlive.bin.core

  ] ++ lib.optional stdenv.hostPlatform.isLinux libseccomp ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;

    ]

    ++ lib.optional stdenv.hostPlatform.isLinux libseccomp

    ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration;



  doCheck = !stdenv.hostPlatform.isDarwin;

pkgs/applications/networking/pjsip/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ stdenv.mkDerivation (finalAttrs: { 


  env =

    lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; }

    // lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; };

    // lib.optionalAttrs stdenv.hostPlatform.isDarwin {

      NIX_CFLAGS_LINK = "-headerpad_max_install_names";

    };



  preConfigure = ''

    export LD=$CC

pkgs/by-name/av/avbroot/package.nix

+3 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { 
    protobuf

  ];



  buildInputs = [ bzip2 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

  buildInputs = [

    bzip2

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];



  meta = {

    description = "Sign (and root) Android A/B OTAs with custom keys while preserving Android Verified Boot";

pkgs/by-name/ch/chatd/package.nix

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ buildNpmPackage rec { 
    find $out/share/chatd/node_modules -name '*.exe' -or -name '*.dll' -or -name '*.pdb' -delete

    rm -rf ${

      lib.concatStringsSep " " (

        (lib.optional (!stdenv.hostPlatform.isx86_64) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64")

        (lib.optional (

          !stdenv.hostPlatform.isx86_64

        ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/x64")

        ++ (lib.optional (

          !stdenv.hostPlatform.isAarch64

        ) "$out/share/chatd/node_modules/onnxruntime-node/bin/napi-v3/*/arm64")