Consolidate conf-compile steps for skarnet.org pkgs.

1 files changed, 6 insertions, 26 deletions

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 8da10b7eb582..650886351e6b 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, skalibs }:
+{ stdenv
+, fetchurl
+, skalibs
+, skarnetConfCompile
+}:
 
 let
 
@@ -13,34 +17,10 @@ in stdenv.mkDerivation rec {
     sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl";
   };
 
-  buildInputs = [ skalibs ];
+  buildInputs = [ skalibs skarnetConfCompile ];
 
   sourceRoot = "admin/${name}";
 
-  configurePhase = ''
-    pushd conf-compile
-
-    printf "$out/bin"           > conf-install-command
-    printf "$out/libexec"       > conf-install-libexec
-
-    # let nix builder strip things, cross-platform
-    truncate --size 0 conf-stripbins
-    truncate --size 0 conf-striplibs
-
-    printf "${skalibs}/sysdeps"      > import
-    printf "%s" "${skalibs}/include" > path-include
-    printf "%s" "${skalibs}/lib"     > path-library
-
-    rm -f flag-slashpackage
-    touch flag-allstatic
-
-    popd
-  '';
-
-  preBuild = ''
-    patchShebangs src/sys
-  '';
-
   preInstall = ''
     mkdir -p "$out/libexec"
   '';