Commit 40799fc0 authored by Artturin's avatar Artturin
Browse files

treewide: replace `stdenv.is` in non nix files

Continuing e0464e47
parent 1174fd66
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ Names of files and directories should be in lowercase, with dashes between words

  ```nix
  {
    buildInputs = lib.optional stdenv.isDarwin iconv;
    buildInputs = lib.optional stdenv.hostPlatform.isDarwin iconv;
  }
  ```

@@ -645,7 +645,7 @@ Names of files and directories should be in lowercase, with dashes between words

  ```nix
  {
    buildInputs = if stdenv.isDarwin then [ iconv ] else null;
    buildInputs = if stdenv.hostPlatform.isDarwin then [ iconv ] else null;
  }
  ```

+2 −2
Original line number Diff line number Diff line
@@ -349,8 +349,8 @@ let
    nodePackages.prettier
  ];

  inputs = basePackages ++ lib.optionals stdenv.isLinux [ inotify-tools ]
    ++ lib.optionals stdenv.isDarwin
  inputs = basePackages ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin
    (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices ]);

  # define shell startup command
+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ One advantage is that when `pkgs.zlib` is updated, it will automatically update
    echo "================= /testing zlib using node ================="
  '';

  postPatch = pkgs.lib.optionalString pkgs.stdenv.isDarwin ''
  postPatch = pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isDarwin ''
    substituteInPlace configure \
      --replace-fail '/usr/bin/libtool' 'ar' \
      --replace-fail 'AR="libtool"' 'AR="ar"' \
+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ On Darwin, if a script has too many `-Idir` flags in its first line (its “sheb
      hash = "sha256-vOhB/FwQMC8PPvdnjDvxRpU6jAZcC6GMQfc0AH4uwKg=";
    };

    nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
    postInstall = lib.optionalString stdenv.isDarwin ''
    nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
    postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
      shortenPerlShebang $out/bin/exiftool
    '';
  };
+1 −1
Original line number Diff line number Diff line
@@ -1306,7 +1306,7 @@ for example:
  ] ++ lib.optionals (pythonAtLeast "3.8") [
    # broken due to python3.8 async changes
    "async"
  ] ++ lib.optionals stdenv.isDarwin [
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
    # can fail when building with other packages
    "socket"
  ];
Loading