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

treewide: move env variable(s) into env for structuredAttrs (D-E) (#490379)

parents 77483bc4 244e4109
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
    sed -i -e 's/INSTALL =.*/INSTALL = install/' Makefile
  '';

  DESTDIR = placeholder "out";
  env.DESTDIR = placeholder "out";

  postConfigure = ''
    make configure
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ buildNpmPackage {
    patchShebangs packages/*/node_modules
  '';

  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

  buildPhase = ''
    runHook preBuild
+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ buildNpmPackage rec {
    patchShebangs packages/*/node_modules
  '';

  ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

  # remove giflib dependency
  npmRebuildFlags = [ "--ignore-scripts" ];
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
  '';

  # Used during the configure phase
  ENVCMD = "${coreutils}/bin/env";
  env.ENVCMD = "${coreutils}/bin/env";

  buildInputs = [ perl ];

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ buildNpmPackage rec {
    hash = "sha256-hBGsqOqKMHNy2SNw1kHCQq1lPDd2S36L5pdKgD2O8FA=";
  };

  ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
  env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

  npmDepsHash = "sha256-FgOHuMMUX92VHF6hdznoi7bhO/27t6+l038kmpqjctQ=";

Loading