auxolotl/labs
26
12
Fork 16
Code Issues 6 Pull requests 10 Projects Releases Packages Wiki Activity Actions

refactor: make dag helpers easier to reason about

Browse source
This commit is contained in:
Jake Hamilton 2024-07-07 15:10:37 -07:00
parent 0a63667459
commit 0ad14e8795
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tidepool/src/builders/basic.nix
View file

@ -17,11 +17,11 @@ in
phases = lib.dag.apply.defaults package.phases {
unpack = lib.dag.entry.before [ "patch" ] "";
patch = lib.dag.entry.between [ "configure" ] [ "unpack" ] "";
patch = lib.dag.entry.between [ "unpack" ] [ "configure" ] "";
configure = lib.dag.entry.between [ "build" ] [ "patch" ] "";
configure = lib.dag.entry.between [ "patch" ] [ "build" ] "";
build = lib.dag.entry.between [ "install" ] [ "configure" ] "";
build = lib.dag.entry.between [ "configure" ] [ "install" ] "";
install = lib.dag.entry.after [ "build" ] "";
};

8
tidepool/src/packages/foundation/glibc/default.nix
View file

@ -79,12 +79,12 @@ in
};
phases = {
unpack = lib.dag.entry.before [ "patch" ] ''
unpack = ''
tar xf ${config.src}
cd glibc-${config.version}
'';
configure = lib.dag.entry.between [ "build" ] [ "patch" ] ''
configure = ''
mkdir build
cd build
# libstdc++.so is built against musl and fails to link
@ -96,12 +96,12 @@ in
--with-headers=${foundation.stage1-linux-headers}/include
'';
build = lib.dag.entry.between [ "install" ] [ "configure" ] ''
build = ''
# Build
make -j $NIX_BUILD_CORES
'';
install = lib.dag.entry.after [ "build" ] ''
install = ''
# Install
make -j $NIX_BUILD_CORES install-strip
'';