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

s6-portable-utils: removed cross, may be causing issue for Darwin

Browse Source
This commit is contained in:
ndowens 2017-03-05 18:25:40 -06:00
parent c4733c3350
commit 237e6dccb2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/s6-portable-utils/default.nix
View File

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