From 2ecc1d1599f446579e0ba6e34fbb83296cc21ed4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 1 Mar 2019 23:11:54 -0500 Subject: [PATCH] stdenv/darwin: move secure-format patch to gnum4 This is the only derivation that needs it anymore. --- .../tools/misc/gnum4}/darwin-secure-format.patch | 0 pkgs/development/tools/misc/gnum4/default.nix | 3 ++- pkgs/stdenv/darwin/default.nix | 6 ------ 3 files changed, 2 insertions(+), 7 deletions(-) rename pkgs/{stdenv/darwin => development/tools/misc/gnum4}/darwin-secure-format.patch (100%) diff --git a/pkgs/stdenv/darwin/darwin-secure-format.patch b/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch similarity index 100% rename from pkgs/stdenv/darwin/darwin-secure-format.patch rename to pkgs/development/tools/misc/gnum4/darwin-secure-format.patch diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index f477d42fcf14..afe9b59e012d 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; # Upstream is aware of it; it may be in the next release. - patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch; + patches = [ ./s_isdir.patch ] + ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { homepage = https://www.gnu.org/software/m4/; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index edbc84b9a68a..3102b255c0a6 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -132,9 +132,6 @@ in rec { extraAttrs = { inherit platform; parent = last; - - # This is used all over the place so I figured I'd just leave it here for now - secure-format-patch = ./darwin-secure-format.patch; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; }; }; @@ -420,9 +417,6 @@ in rec { inherit platform bootstrapTools; libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - - # This is used all over the place so I figured I'd just leave it here for now - secure-format-patch = ./darwin-secure-format.patch; }; allowedRequisites = (with pkgs; [