Unverified Commit 4cc13109 authored by Stefan Frijters's avatar Stefan Frijters
Browse files

nix-functional-tests: move env variables into env for structuredAttrs

parent e12b1007

pkgs/tools/package-management/nix/modular/tests/functional/package.nix

+5 −4
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ mkMesonDerivation ( 
      nix-expr

    ];



    env = lib.optionalAttrs (test-daemon != null) {

      NIX_DAEMON_PACKAGE = test-daemon;

      _NIX_TEST_CLIENT_VERSION = nix-cli.version;

    };



    preConfigure =

      # TEMP hack for Meson before make is gone, where

      # `src/nix-functional-tests` is during the transition a symlink and
@@ -93,8 +98,4 @@ mkMesonDerivation ( 
    };



  }

  // lib.optionalAttrs (test-daemon != null) {

    NIX_DAEMON_PACKAGE = test-daemon;

    _NIX_TEST_CLIENT_VERSION = nix-cli.version;

  }

)