JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdenv/darwin: move secure-format patch to gnum4

Browse Source 
This is the only derivation that needs it anymore.
This commit is contained in:
Matthew Bauer 2019-03-01 23:11:54 -05:00
parent 7f08b28bbf
commit 2ecc1d1599
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/stdenv/darwin/darwin-secure-format.patch → pkgs/development/tools/misc/gnum4/darwin-secure-format.patch
View File

3
pkgs/development/tools/misc/gnum4/default.nix
View File

@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ];
# Upstream is aware of it; it may be in the next release. # 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 = { meta = {
homepage = https://www.gnu.org/software/m4/; homepage = https://www.gnu.org/software/m4/;

6
pkgs/stdenv/darwin/default.nix
View File

@ -132,9 +132,6 @@ in rec {
extraAttrs = { extraAttrs = {
inherit platform; inherit platform;
parent = last; 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; }; overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
}; };
@ -420,9 +417,6 @@ in rec {
inherit platform bootstrapTools; inherit platform bootstrapTools;
libc = pkgs.darwin.Libsystem; libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash; 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; [ allowedRequisites = (with pkgs; [