Unverified Commit 7334b98b authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: move env variable(s) into env for structuredAttrs (S-T) (#488549)

parents bc4a1b32 b643d44b

pkgs/applications/audio/snapcast/default.nix

+3 −1
Original line number Diff line number Diff line
@@ -59,7 +59,9 @@ stdenv.mkDerivation rec { 
  ++ lib.optional pipewireSupport pipewire

  ++ lib.optional stdenv.hostPlatform.isLinux alsa-lib;



  TARGET = lib.optionalString stdenv.hostPlatform.isDarwin "MACOS";

  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

    TARGET = "MACOS";

  };



  cmakeFlags = [

    (lib.cmakeBool "BUILD_WITH_PULSE" pulseaudioSupport)

pkgs/by-name/bu/bulloak/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  doCheck = false;



  # provide the list of solc versions to the `svm-rs-builds` dependency

  SVM_RELEASES_LIST_JSON =

  env.SVM_RELEASES_LIST_JSON =

    solc-versions.${stdenv.hostPlatform.system}

      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

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

+6 −4
Original line number Diff line number Diff line
@@ -39,10 +39,12 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-LOhBBd7QL5kH4TzMFgrh70C37WsFdsiKArP+tIEiPWo=";

  };



  env = {

    # dbus-1.pc has datadir=/etc

    SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services";

    # polkit-gobject-1.pc has prefix=${polkit.out}

    POLKIT_ACTION_DIR = "${placeholder "out"}/share/polkit-1/actions";

  };



  postPatch = ''

    sed -i "s@pkg_get_variable(SYSTEM_BUS_DIR.*@set(SYSTEM_BUS_DIR $SYSTEM_BUS_DIR)@" CMakeLists.txt

pkgs/by-name/da/dawarich/package.nix

+6 −4
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = sources.npmHash;

  };



  env = {

    RAILS_ENV = "production";

    NODE_ENV = "production";

    REDIS_URL = ""; # build error if not defined

    TAILWINDCSS_INSTALL_DIR = "${tailwindcss_3}/bin";

  };



  nativeBuildInputs = [

    nodejs

pkgs/by-name/en/entr/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { 
  checkTarget = "test";

  installFlags = [ "PREFIX=$(out)" ];



  TARGET_OS = stdenv.hostPlatform.uname.system;

  env.TARGET_OS = stdenv.hostPlatform.uname.system;



  meta = {

    homepage = "https://eradman.com/entrproject/";