diff options
| author | Patrick Mahoney <pat@polycrystal.org> | 2014-11-28 13:10:37 -0600 |
|---|---|---|
| committer | Patrick Mahoney <pat@polycrystal.org> | 2014-11-28 13:10:37 -0600 |
| commit | cf5f282940c9ac07533ef602e2ea415e1a5ed517 (patch) | |
| tree | 3195d77badf3e6557f58ad42ed506b22bf1a4494 /pkgs/servers/s6 | |
| parent | c37611f3e5a35ecfa349362d432708176e1c6fb5 (diff) | |
| download | nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar.gz nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar.bz2 nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar.lz nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar.xz nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.tar.zst nixlib-cf5f282940c9ac07533ef602e2ea415e1a5ed517.zip | |
Consolidate conf-compile steps for skarnet.org pkgs.
Diffstat (limited to 'pkgs/servers/s6')
| -rw-r--r-- | pkgs/servers/s6/default.nix | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 039128e9df4c..491dc625cf21 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -1,4 +1,9 @@ -{stdenv, fetchurl, skalibs, execline}: +{ stdenv +, execline +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,38 +18,13 @@ in stdenv.mkDerivation rec { sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; }; - buildInputs = [ skalibs execline ]; + buildInputs = [ skalibs execline skarnetConfCompile ]; sourceRoot = "admin/${name}"; - configurePhase = '' - pushd conf-compile - - printf "$out/bin" > conf-install-command - printf "$out/include" > conf-install-include - printf "$out/lib" > conf-install-library - printf "$out/lib" > conf-install-library.so - printf "$out/sysdeps" > conf-install-sysdeps - - # let nix builder strip things, cross-platform - truncate --size 0 conf-stripbins - truncate --size 0 conf-striplibs - - printf "${skalibs}/sysdeps" > import - printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include - printf "%s\n%s" "${skalibs}/lib" "${execline}/lib" > path-library - - rm -f flag-slashpackage - touch flag-allstatic - - popd - ''; - preBuild = '' substituteInPlace "src/daemontools-extras/s6-log.c" \ --replace '"execlineb"' '"${execline}/bin/execlineb"' - - patchShebangs src/sys ''; meta = { |