Skip to content

Commit

Permalink
Linting: Remove trailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
prinzdezibel committed Dec 10, 2024
1 parent 7f38563 commit 2187ab6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions nixos/lib/make-disk-image.nix
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ let format' = format; in let
--system ${config.system.build.toplevel} \
${if copyChannel then "--channel ${channelSources}" else "--no-channel-copy"} \
--substituters ""
${lib.optionalString (additionalPaths' != []) ''
nix --extra-experimental-features nix-command copy --to $root --no-check-sigs ${lib.concatStringsSep " " additionalPaths'}
''}
Expand Down Expand Up @@ -544,7 +544,7 @@ let format' = format; in let
mkdir -p $out/nix-support
echo "file ${format}-image $out/${filename}" >> $out/nix-support/hydra-build-products
'';

buildSystem = pkgs.stdenv.buildPlatform.system;
hostSystem = pkgs.stdenv.hostPlatform.system;
crossPkgs = if (hostSystem != buildSystem) then
Expand Down Expand Up @@ -585,7 +585,7 @@ let format' = format; in let
mountPoint=/mnt
mkdir $mountPoint
mount $rootDisk $mountPoint
# Fix activation error (not related to PR)
mkdir $mountPoint/run
mount -t tmpfs -o "mode=755" none $mountPoint/run
Expand Down
10 changes: 5 additions & 5 deletions pkgs/build-support/vm/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,16 @@ rec {
};

# Switch standard build environment to target host platform
stage2Stdenv =
stage2Stdenv =
let
buildSystem = pkgs.stdenv.buildPlatform.system;
hostSystem = pkgs.stdenv.hostPlatform.system;
in if (buildSystem == hostSystem) then stdenv else
in if (buildSystem == hostSystem) then stdenv else
let
targetArch = if ( hostSystem == "x86_64-linux") then
targetArch = if ( hostSystem == "x86_64-linux") then
"gnu64" else
"aarch64-multiplatform";
in
in
pkgs.stdenv.override {
buildPlatform = pkgs.stdenv.hostPlatform;
cc = null;
Expand Down Expand Up @@ -201,7 +201,7 @@ rec {
source ${stage2Stdenv}/setup
export stdenv=${stage2Stdenv}
if ! test -e /bin/sh; then
${coreutils}/bin/mkdir -p /bin
${coreutils}/bin/ln -s ${bash}/bin/sh /bin/sh
Expand Down

0 comments on commit 2187ab6

Please sign in to comment.