Unverified Commit 3451e0ac authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

treewide: move env variable(s) into env for structuredAttrs (H-J) (#490081)

parents 73d56417 9b1e7a73

pkgs/by-name/ci/cilium-cli/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  cilium-cli,

  fetchFromGitHub,

  installShellFiles,

  writableTmpDirAsHomeHook,

  testers,

}:
@@ -21,6 +22,10 @@ buildGoModule (finalAttrs: { 


  nativeBuildInputs = [ installShellFiles ];



  # Required to workaround install check error:

  # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied

  nativeInstallCheckInputs = [ writableTmpDirAsHomeHook ];



  vendorHash = null;



  subPackages = [ "cmd/cilium" ];
@@ -31,10 +36,6 @@ buildGoModule (finalAttrs: { 
    "-X=github.com/cilium/cilium/cilium-cli/defaults.CLIVersion=${finalAttrs.version}"

  ];



  # Required to workaround install check error:

  # 2022/06/25 10:36:22 Unable to start gops: mkdir /homeless-shelter: permission denied

  HOME = "$TMPDIR";



  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

    installShellCompletion --cmd cilium \

      --bash <($out/bin/cilium completion bash) \

pkgs/by-name/db/dbus_java/package.nix

+8 −5
Original line number Diff line number Diff line
@@ -15,11 +15,14 @@ stdenv.mkDerivation (finalAttrs: { 
    url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-${finalAttrs.version}.tar.gz";

    sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y";

  };



  env = {

    JAVA_HOME = jdk8;

    JAVA = "${jdk8}/bin/java";

    PREFIX = "\${out}";

    JAVAUNIXLIBDIR = "${libmatthew_java}/lib/jni";

    JAVAUNIXJARDIR = "${libmatthew_java}/share/java";

  };

  buildInputs = [

    gettext

    jdk8

pkgs/by-name/fl/fluxcd/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
  installShellFiles,

  lib,

  stdenv,

  writableTmpDirAsHomeHook,

}:



let
@@ -46,11 +47,11 @@ buildGoModule rec { 


  subPackages = [ "cmd/flux" ];



  nativeBuildInputs = [ installShellFiles ];



  # Required to workaround test error:

  #   panic: mkdir /homeless-shelter: permission denied

  HOME = "$TMPDIR";



  nativeBuildInputs = [ installShellFiles ];

  nativeCheckInputs = [ writableTmpDirAsHomeHook ];



  doInstallCheck = true;

  installCheckPhase = ''

pkgs/by-name/hd/hdfview/package.nix

+4 −2
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ stdenv.mkDerivation (finalAttrs: { 
    stripJavaArchivesHook

  ];



  env = {

    HDFLIBS = (hdf4.override { javaSupport = true; }).out;

    HDF5LIBS = (hdf5.override { javaSupport = true; }).out;

  };



  buildPhase =

    let

pkgs/by-name/ho/hottext/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ buildNimPackage (finalAttrs: { 


  lockFile = ./lock.json;



  HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";

  env.HOTTEXT_FONT_PATH = "${gentium-plus}/share/fonts/truetype/GentiumPlus-Regular.ttf";



  desktopItem = makeDesktopItem {

    categories = [ "Utility" ];