From 1dbb306b8755b06fb2b6c0c4cebcb4da59d6cfc2 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 13 Aug 2021 17:28:26 -0700 Subject: [PATCH] pkgsStatic.perl: Use `dontAddStaticConfigureFlags` instead of overriding Signed-off-by: Pamplemousse --- pkgs/development/interpreters/perl/default.nix | 2 ++ pkgs/top-level/static.nix | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3b39974c16b1..c1f1bfc0b4ad 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -86,6 +86,8 @@ let configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + dontAddStaticConfigureFlags = true; + dontAddPrefix = !crossCompiling; enableParallelBuilding = !crossCompiling; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 0c9af250e876..55bba46c7622 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -121,11 +121,6 @@ in { if set ? overrideScope' then set.overrideScope' ocamlStaticAdapter else set ) super.ocaml-ng; - perl = super.perl.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; zlib = super.zlib.override { # Don’t use new stdenv zlib because