Unverified Commit af50c285 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

splice.nix: remove toplevel {build,host,target}Platform in `__splicedPackages` (#350299)

parents 3f1f36d2 95c1043f

pkgs/applications/networking/browsers/chromium/common.nix

+0 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchpatch

, recompressTarball

, buildPackages

, buildPlatform

, pkgsBuildBuild

# Channel data:

, channel, upstream-info

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

+3 −3
Original line number Diff line number Diff line 
{ hostPlatform, callPackage }:

{ stdenv, callPackage }:

{

  signal-desktop =

    if hostPlatform.system == "aarch64-linux" then

    if stdenv.hostPlatform.system == "aarch64-linux" then

      callPackage ./signal-desktop-aarch64.nix { }

    else if hostPlatform.isDarwin then

    else if stdenv.hostPlatform.isDarwin then

      callPackage ./signal-desktop-darwin.nix { }

    else

      callPackage ./signal-desktop.nix { };

pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix

+3 −3
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, hostPlatform

, stdenv

, lld

}:



let

  arch = hostPlatform.qemuArch;

  arch = stdenv.hostPlatform.qemuArch;



  target = ./. + "/${arch}-unknown-none.json";
@@ -15,7 +15,7 @@ assert lib.assertMsg (builtins.pathExists target) "Target spec not found"; 


let

  cross = import ../../../.. {

    system = hostPlatform.system;

    system = stdenv.hostPlatform.system;

    crossSystem = lib.systems.examples."${arch}-embedded" // {

      rust.rustcTarget = "${arch}-unknown-none";

      rust.platform = lib.importJSON target;

pkgs/by-name/bo/bombsquad/package.nix

+1 −2
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  targetPlatform,

  fetchurl,

  python312,

  SDL2,
@@ -30,7 +29,7 @@ let 
        hash = "sha256-o1Yg0C5k07NZzc9jQrHXR+kkQl8HZ55U9/fqcpe3Iyw=";

      };

    }

    .${targetPlatform.system} or (throw "${targetPlatform.system} is unsupported.");

    .${stdenv.targetPlatform.system} or (throw "${stdenv.targetPlatform.system} is unsupported.");

in

stdenv.mkDerivation (finalAttrs: {

  pname = "bombsquad";

pkgs/by-name/pu/pupdate/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
, dotnetCorePackages

, openssl

, zlib

, hostPlatform

, nix-update-script

}:
@@ -30,7 +29,7 @@ buildDotnetModule rec { 
  patches = [ ./add-runtime-identifier.patch ];

  postPatch = ''

    substituteInPlace pupdate.csproj \

      --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid hostPlatform.system}"

      --replace @RuntimeIdentifier@ "${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"

  '';



  projectFile = "pupdate.csproj";