MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

s6-portable-utils: Trying again for gcc support

Browse source
This commit is contained in:
ndowens 2017-03-05 18:00:50 -06:00
parent 4c42fac493
commit c4733c3350
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/tools/misc/s6-portable-utils/default.nix
View file

@ -1,5 +1,7 @@
{ stdenv, fetchFromGitHub, skalibs, gcc }: { stdenv, fetchFromGitHub, skalibs, gcc }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "s6-portable-utils-${version}"; name = "s6-portable-utils-${version}";
version = "2.1.0.0"; version = "2.1.0.0";
@ -13,8 +15,8 @@ stdenv.mkDerivation rec {
dontDisableStatic = true; dontDisableStatic = true;
# Darwin Support, optional isDarwin failed nativeBuildInputs = []
nativeBuildInputs = [ gcc ]; ++ optional stdenv.isDarwin gcc;
configureFlags = [ configureFlags = [
"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
@ -22,9 +24,10 @@ stdenv.mkDerivation rec {
"--with-lib=${skalibs}/lib" "--with-lib=${skalibs}/lib"
"--with-dynlib=${skalibs}/lib" "--with-dynlib=${skalibs}/lib"
] ]
++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}"); ++ (optional stdenv.isDarwin "--target=${stdenv.system}")
++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin");
meta = with stdenv.lib; { 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";
platforms = platforms.all; platforms = platforms.all;