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

treewide: move env variable(s) into env for structuredAttrs (U-Z) (#488526)

parents a76b7170 5be8aba0

pkgs/applications/networking/mailreaders/notmuch/muchsync.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 
    xapian

    zlib

  ];

  XAPIAN_CONFIG = "${xapian}/bin/xapian-config";

  env.XAPIAN_CONFIG = "${xapian}/bin/xapian-config";

  meta = {

    description = "Synchronize maildirs and notmuch databases";

    mainProgram = "muchsync";

pkgs/by-name/ad/adoptopenjdk-icedtea-web/package.nix

+4 −2
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ stdenv.mkDerivation (finalAttrs: { 
    touch $XDG_CONFIG_HOME/icedtea-web/deployment.properties

  '';



  env = {

    HOME = "/build";

    XDG_CONFIG_HOME = "/build";

  };



  configureFlags = [

    "--with-itw-libs=DISTRIBUTION"

pkgs/by-name/av/avalonia/package.nix

+15 −14
Original line number Diff line number Diff line
@@ -70,12 +70,22 @@ stdenvNoCC.mkDerivation ( 
        ./0004-disable-windows-desktop.patch

      ];



      env = {

        # this needs to be match the version being patched above

        UNICODE_CHARACTER_DATABASE = fetchzip {

          url = "https://www.unicode.org/Public/15.0.0/ucd/UCD.zip";

          hash = "sha256-jj6bX46VcnH7vpc9GwM9gArG+hSPbOGL6E4SaVd0s60=";

          stripRoot = false;

        };

        FONTCONFIG_FILE =

          let

            fc = makeFontsConf { fontDirectories = [ liberation_ttf ]; };

          in

          runCommand "fonts.conf" { } ''

            substitute ${fc} $out \

            --replace-fail "/etc/" "${fontconfig.out}/etc/"

          '';

      };



      postPatch = ''

        patchShebangs build.sh
@@ -142,15 +152,6 @@ stdenvNoCC.mkDerivation ( 
      #  - NuGet packages config '/build/source/nukebuild/_build.csproj'

      linkNuGetPackagesAndSources = true;



      FONTCONFIG_FILE =

        let

          fc = makeFontsConf { fontDirectories = [ liberation_ttf ]; };

        in

        runCommand "fonts.conf" { } ''

          substitute ${fc} $out \

            --replace-fail "/etc/" "${fontconfig.out}/etc/"

        '';



      preConfigure = ''

        # closed source (telemetry?) https://github.com/AvaloniaUI/Avalonia/discussions/16878

        dotnet remove packages/Avalonia/Avalonia.csproj package Avalonia.BuildServices

pkgs/by-name/de/deadlock-mod-manager/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    ./no-updater-artifacts.patch

  ];



  VITE_API_URL = "https://api.deadlockmods.app";

  env.VITE_API_URL = "https://api.deadlockmods.app";



  # Skip tests that require network access

  checkFlags = [

pkgs/by-name/di/digitalbitbox/package.nix

+8 −6
Original line number Diff line number Diff line
@@ -84,12 +84,14 @@ stdenv.mkDerivation (finalAttrs: { 
    libsForQt5.qtmultimedia

  ];



  env = {

    LUPDATE = "${libsForQt5.qttools.dev}/bin/lupdate";

    LRELEASE = "${libsForQt5.qttools.dev}/bin/lrelease";

    MOC = "${libsForQt5.qtbase.dev}/bin/moc";

    QTDIR = libsForQt5.qtbase.dev;

    RCC = "${libsForQt5.qtbase.dev}/bin/rcc";

    UIC = "${libsForQt5.qtbase.dev}/bin/uic";

  };



  configureFlags = [

    "--enable-libusb"