Unverified Commit 8fb7372c authored by jopejoe1's avatar jopejoe1 Committed by GitHub
Browse files

treewide: move env variable(s) into env for structuredAttrs (F-G) (#490354)

parents 9b326513 5078d790

pkgs/applications/networking/cluster/rke2/builder.nix

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ buildGoModule (finalAttrs: { 
  ];



  # Passing boringcrypto to GOEXPERIMENT variable to build with goboring library

  GOEXPERIMENT = "boringcrypto";

  env.GOEXPERIMENT = "boringcrypto";



  # https://github.com/rancher/rke2/blob/104ddbf3de65ab5490aedff36df2332d503d90fe/scripts/build-binary#L27-L39

  ldflags =

pkgs/build-support/docker/tarsum.nix

+5 −3
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ stdenv.mkDerivation { 


  dontUnpack = true;



  env = {

    CGO_ENABLED = 0;

    GOFLAGS = "-trimpath";

    GO111MODULE = "off";

  };



  buildPhase = ''

    runHook preBuild

pkgs/by-name/dw/dwarfs/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];

  # these fail inside of the sandbox due to missing access

  # to the FUSE device

  GTEST_FILTER =

  env.GTEST_FILTER =

    let

      disabledTests = [

        "dwarfs/tools_test.end_to_end/*"

pkgs/by-name/ed/edk2/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { 
          ++ attrs.nativeBuildInputs or [ ];

          strictDeps = true;



          ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;

          env.${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;



          prePatch = ''

            rm -rf BaseTools

pkgs/by-name/fi/fig2dev/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { 
  nativeBuildInputs = [ makeWrapper ];

  buildInputs = [ libpng ];



  GSEXE = "${ghostscript}/bin/gs";

  env.GSEXE = "${ghostscript}/bin/gs";



  configureFlags = [ "--enable-transfig" ];