diff options
| author | Artturin <Artturin@artturin.com> | 2022-12-08 04:52:11 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-12-08 21:09:02 +0200 |
| commit | c41cc9e762a97c20ec3be01db254787c046510e2 (patch) | |
| tree | 304dfc5bec3f654c586337c28439def9e54498b0 | |
| parent | 02e3f51d27417f2775982281fc39e31a4978ae39 (diff) | |
| download | nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar.gz nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar.bz2 nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar.lz nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar.xz nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.tar.zst nixpkgs-c41cc9e762a97c20ec3be01db254787c046510e2.zip | |
treewide: move some perl vars to env attrset
| -rw-r--r-- | pkgs/development/libraries/xapian/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/munin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 700fa1d13dd..3c0a555dd97 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -26,7 +26,7 @@ let nativeBuildInputs = [ autoreconfHook ]; doCheck = true; - AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git + env.AUTOMATED_TESTING = true; # https://trac.xapian.org/changeset/8be35f5e1/git patches = lib.optionals stdenv.isDarwin [ ./skip-flaky-darwin-test.patch ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 0bfc868167c..2016bbe9ed3 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; # needs to find a local perl module during build - PERL_USE_UNSAFE_INC = "1"; + env.PERL_USE_UNSAFE_INC = "1"; # TODO: tests are failing https://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e0cecf43d26..63d31a6cf57 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23029,7 +23029,7 @@ let # For some crazy reason Makefile.PL doesn't generate a Makefile if # AUTOMATED_TESTING is set. - AUTOMATED_TESTING = false; + env.AUTOMATED_TESTING = false; # Makefile.PL looks for ncurses in Glibc's prefix. preConfigure = @@ -27058,7 +27058,7 @@ let hash = "sha256-gxxY8549/ebS3QORjSs8IgdBs2aD05Tu+9Bn70gu7gQ="; }) ]; - AUTOMATED_TESTING = false; + env.AUTOMATED_TESTING = false; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.xorg.libxcb pkgs.xorg.xcbproto pkgs.xorg.xcbutil pkgs.xorg.xcbutilwm ExtUtilsDepends ExtUtilsPkgConfig TestDeep TestException XSObjectMagic ]; propagatedBuildInputs = [ DataDump MouseXNativeTraits XMLDescent XMLSimple ]; |