Commit e171199c authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt
Browse files

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

parent 20758943

pkgs/applications/editors/rstudio/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ stdenv.mkDerivation rec { 
      (lib.cmakeBool "QUARTO_ENABLED" true)

      (lib.cmakeBool "RSTUDIO_CRASHPAD_ENABLED" false) # This is a NOOP except on x86_64-darwin

      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (

        (placeholder "out") + (if stdenv.isDarwin then "/Applications" else "/lib/rstudio")

        (placeholder "out") + (if stdenv.hostPlatform.isDarwin then "/Applications" else "/lib/rstudio")

      ))

    ]

    ++ lib.optionals (!server) [

pkgs/applications/science/electronics/qucs-s/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ];

  buildInputs = [ qtbase qttools qtcharts qtsvg gperf adms ]

    ++ lib.optionals stdenv.isLinux [ qtwayland libX11 ]

    ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland libX11 ]

    ++ kernels;



  cmakeFlags = [

pkgs/applications/video/jellyfin-media-player/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ mkDerivation rec { 
    ln -s ${jellyfin-web}/share/jellyfin-web .

  '';



  postInstall = lib.optionalString stdenv.isDarwin ''

  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

    mkdir -p $out/bin $out/Applications

    mv "$out/Jellyfin Media Player.app" $out/Applications

    ln -s "$out/Applications/Jellyfin Media Player.app/Contents/MacOS/Jellyfin Media Player" $out/bin/jellyfinmediaplayer

pkgs/by-name/am/amazon-cloudwatch-agent/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ buildGoModule rec { 
  versionCheckProgramArg = "-version";



  passthru = {

    tests = lib.optionalAttrs stdenv.isLinux {

    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {

      inherit (nixosTests) amazon-cloudwatch-agent;

    };

pkgs/by-name/am/amneziawg-tools/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
      substituteInPlace $out/lib/systemd/system/awg-quick@.service \

        --replace-fail /usr/bin $out/bin

    ''

    + lib.optionalString stdenv.isLinux ''

    + lib.optionalString stdenv.hostPlatform.isLinux ''

      for f in $out/bin/*; do

        # Which firewall and resolvconf implementations to use should be determined by the

        # environment, we provide the "default" ones as fallback.
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { 
          }

      done

    ''

    + lib.optionalString stdenv.isDarwin ''

    + lib.optionalString stdenv.hostPlatform.isDarwin ''

      for f in $out/bin/*; do

        wrapProgram $f \

          --prefix PATH : ${lib.makeBinPath [ amneziawg-go ]}