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/os-specific/linux/s6-linux-utils | |
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/os-specific/linux/s6-linux-utils')
-rw-r--r-- | pkgs/os-specific/linux/s6-linux-utils/default.nix | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index a50400e492a8..b7a546a3ea06 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchurl, skalibs }: +{ stdenv +, fetchurl +, skalibs +, skarnetConfCompile +}: let @@ -13,36 +17,10 @@ in stdenv.mkDerivation rec { sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d"; }; - buildInputs = [ skalibs ]; + buildInputs = [ skalibs 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 - - # 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 - ''; - meta = { homepage = http://www.skarnet.org/software/s6-linux-utils/; description = "A set of minimalistic Linux-specific system utilities"; |