From 5c18f3760d1f7daaff910225bccb40faa28364ee Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 5 Mar 2017 19:35:53 -0600 Subject: [PATCH] s6-portable-utils: readded config flags --- pkgs/tools/misc/s6-portable-utils/default.nix | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 06ea8a406f91..b16806139b45 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -1,9 +1,6 @@ { stdenv, fetchFromGitHub, skalibs, gcc }: with stdenv.lib; -let - cross = ""; -in stdenv.mkDerivation rec { name = "s6-portable-utils-${version}"; @@ -17,18 +14,18 @@ stdenv.mkDerivation rec { }; dontDisableStatic = true; - + nativeBuildInputs = [] - ++ optional stdenv.isDarwin gcc; - + ++ optional stdenv.isDarwin gcc; + configureFlags = [ - #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" - #"--with-include=${skalibs}/include" - "--with-lib=${skalibs}/lib" - "--with-dynlib=${skalibs}/lib" - ]; - - + "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps" + "--with-include=${skalibs}/include" + "--with-lib=${skalibs}/lib" + "--with-dynlib=${skalibs}/lib" + ]; + + meta = { homepage = http://www.skarnet.org/software/s6-portable-utils/; description = "A set of tiny general Unix utilities optimized for simplicity and small size";