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

treewide: move env vars into env for structuredAttrs (#492165)

parents e87477cc 65abc2b6

pkgs/applications/audio/mopidy/moped.nix

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { 
    sha256 = "15461174037d87af93dd59a236d4275c5abf71cea0670ffff24a7d0399a8a2e4";

  };



  LC_ALL = "en_US.UTF-8";

  env.LC_ALL = "en_US.UTF-8";

  buildInputs = [ glibcLocales ];



  build-system = [ pythonPackages.setuptools ];

pkgs/applications/graphics/rawtherapee/default.nix

+12 −6
Original line number Diff line number Diff line
@@ -116,12 +116,18 @@ stdenv.mkDerivation rec { 
    "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"

  ];



  env = {

    CMAKE_CXX_FLAGS = toString [

      "-std=c++11"

      "-Wno-deprecated-declarations"

      "-Wno-unused-result"

    ];

  env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux

    # needed at least with gcc13 on aarch64-linux

    CXXFLAGS = toString [

      "-include"

      "cstdint"

    ];

  };



  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''

    mkdir -p $out/Applications/RawTherapee.app $out/bin

pkgs/applications/networking/instant-messengers/profanity/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { 


  doCheck = true;



  LC_ALL = "en_US.utf8";

  env.LC_ALL = "en_US.utf8";



  meta = {

    homepage = "https://profanity-im.github.io";

pkgs/by-name/an/animeko/package.nix

+4 −3
Original line number Diff line number Diff line
@@ -144,7 +144,10 @@ stdenv.mkDerivation (finalAttrs: { 
    useBwrap = false;

  };



  env.JAVA_HOME = jetbrains.jdk;

  env = {

    JAVA_HOME = jetbrains.jdk;

    ANDROID_SDK_HOME = "$(pwd)";

  };



  gradleFlags = [

    "-Dorg.gradle.java.home=${jetbrains.jdk}"
@@ -257,8 +260,6 @@ stdenv.mkDerivation (finalAttrs: { 
    ln -sf ${libvlc}/lib $out/lib/app/resources/

  '';



  ANDROID_SDK_HOME = "$(pwd)";



  passthru.updateScript = writeShellScript "update-animeko" ''

    ${lib.getExe nix-update} animeko

    $(nix-build -A animeko.mitmCache.updateScript)

pkgs/by-name/ar/arc-theme/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec { 
  '';



  # Fontconfig error: Cannot load default config file: No such file: (null)

  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };

  env.FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };



  mesonFlags = [

    # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"