Update skarnet.org software for 2.0 release.
New build system using configure script and GNU Make 4.0, and new releases of the following using the new build system: execline 2.0.0.0 s6 2.0.0.0 s6-dns 2.0.0.0 s6-linux-utils 2.0.0.0 s6-networking 2.0.0.0 s6-portable-utils 2.0.0.0 skalibs 2.0.0.0
This commit is contained in:
@@ -1,21 +0,0 @@
|
||||
{ stdenv }:
|
||||
|
||||
let
|
||||
|
||||
version = "2014-11-28";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
|
||||
name = "skarnet-conf-compile-${version}";
|
||||
|
||||
phases = [ "fixupPhase" ];
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.skarnet.org/software/conf-compile.html;
|
||||
description = "Support for configuring skarnet.org packages for nix builds";
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
# Packages from skarnet.org use a unique build system. These functions
|
||||
# assist with some common configuration and shebang patching.
|
||||
|
||||
skarnetConfigure() {
|
||||
runHook preConfigure
|
||||
|
||||
pushd conf-compile >/dev/null
|
||||
|
||||
# paths
|
||||
> conf-defaultpath printf "$out/bin"
|
||||
> conf-etc printf "$out/etc"
|
||||
> conf-install-command printf "$out/bin"
|
||||
> conf-install-include printf "$out/include"
|
||||
> conf-install-libexec printf "$out/libexec"
|
||||
> conf-install-library printf "$out/lib"
|
||||
> conf-install-library.so printf "$out/lib"
|
||||
> conf-install-sysdeps printf "$out/sysdeps"
|
||||
|
||||
# use generic 'cc' to support both gcc and clang (darwin) stdenvs
|
||||
for file in conf-cc conf-dynld conf-ld; do
|
||||
substituteInPlace $file --replace gcc cc
|
||||
done
|
||||
|
||||
# let nix builder strip things, cross-platform
|
||||
truncate --size 0 conf-stripbins conf-striplibs
|
||||
|
||||
rm -f flag-slashpackage
|
||||
touch flag-allstatic
|
||||
touch flag-forcedevr # only used for skalibs
|
||||
|
||||
# build inputs
|
||||
truncate --size 0 import path-include path-library
|
||||
for input in $nativeBuildInputs; do
|
||||
[[ -a "$input/sysdeps" ]] && >> import printf "$input/sysdeps"
|
||||
[[ -a "$input/include" ]] && >> path-include printf "$input/include"
|
||||
[[ -a "$input/lib" ]] && >> path-library printf "$input/lib"
|
||||
done
|
||||
|
||||
popd >/dev/null
|
||||
|
||||
# patch various scripts to use stdenv shell
|
||||
patchShebangs src/sys
|
||||
|
||||
runHook postConfigure
|
||||
}
|
||||
|
||||
export configurePhase=skarnetConfigure
|
||||
Reference in New Issue
Block a user