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

treewide: move env variable(s) into env for structuredAttrs (N-O) (#489376)

parents b1c76ee7 7e108d8c

pkgs/by-name/ac/acpica-tools/package.nix

+13 −11
Original line number Diff line number Diff line
@@ -34,12 +34,11 @@ stdenv.mkDerivation (finalAttrs: { 
    "iasl"

  ];



  env.NIX_CFLAGS_COMPILE = toString [

  env = {

    NIX_CFLAGS_COMPILE = toString [

      "-O3"

    ];



  enableParallelBuilding = true;



    # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable

    # -Werror altogether to make this derivation less fragile to toolchain

    # updates.
@@ -48,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: { 
    # We can handle stripping ourselves.

    # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected.

    INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555";

  };



  enableParallelBuilding = true;



  installFlags = [ "PREFIX=${placeholder "out"}" ];

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec { 
      --replace "version = 'git'" "version = '${version}'"

  '';



  NODE_OPTIONS = "--openssl-legacy-provider";

  env.NODE_OPTIONS = "--openssl-legacy-provider";



  nativeBuildInputs = [

    makeWrapper

pkgs/by-name/cl/clmagma/package.nix

+7 −5
Original line number Diff line number Diff line
@@ -60,12 +60,14 @@ stdenv.mkDerivation rec { 


  enableParallelBuilding = true;



  MKLROOT = "${mkl}";

  clBLAS = "${clblas}";

  env = {

    MKLROOT = mkl;

    clBLAS = clblas;



    # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors,

    # which is not available.

    OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors";

  };



  preBuild = ''

    # By default it tries to use GPU, and thus fails for CPUs

pkgs/by-name/co/coc-emmet/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    nodejs

  ];



  NODE_OPTIONS = "--openssl-legacy-provider";

  env.NODE_OPTIONS = "--openssl-legacy-provider";



  passthru.updateScript = nix-update-script { };

pkgs/by-name/co/coc-r-lsp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    nodejs

  ];



  NODE_OPTIONS = "--openssl-legacy-provider";

  env.NODE_OPTIONS = "--openssl-legacy-provider";



  passthru.updateScript = nix-update-script { };