From 237e6dccb2a09ebe28aa7feed72b7061b4ef6cd7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 18:25:40 -0600
Subject: [PATCH] s6-portable-utils: removed cross, may be causing issue for
 Darwin

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 7e81a37cc36..d0855f24f3a 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchFromGitHub, skalibs, gcc }:
 
 with stdenv.lib;
+let
+  cross = "";
+in
 
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
@@ -17,7 +20,12 @@ stdenv.mkDerivation rec {
   
   nativeBuildInputs = []
     ++ optional stdenv.isDarwin gcc;
-    
+  
+  preConfigure = ''
+    substituteInPlace configure \
+      "${cross}" " "
+      '';
+
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
@@ -25,8 +33,7 @@ stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs}/lib"
   ]
   ++ (optional stdenv.isDarwin "--target=${stdenv.system}")
-  ++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin");
-
+  ;
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";