Skip to content

Commit

Permalink
build: other nix build tool chain
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice committed Aug 9, 2024
1 parent e4dd9d9 commit 4bfd58c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ ENTRYPOINT [ "dumb-init", "--", "builder.sh" ]
COPY --chmod=755 bin /usr/local/bin


# renovate: datasource=github-tags packageName=NixOS/nix
RUN install-tool nix 2.24.2

ENV TOOL_NAME=nix

RUN install-builder.sh
Expand Down
2 changes: 1 addition & 1 deletion bin/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ git reset --hard "${TOOL_VERSION}"

echo "------------------------"
echo "build ${TOOL_NAME}"
nix --extra-experimental-features "nix-command flakes" build .#nix-static
nix-build .#nix-static

mkdir "/usr/local/${TOOL_NAME}/${TOOL_VERSION}/bin"
cp result/bin/nix "/usr/local/${TOOL_NAME}/${TOOL_VERSION}/bin/nix"
Expand Down
5 changes: 4 additions & 1 deletion bin/install-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ set -e
# shellcheck source=/dev/null
. /usr/local/containerbase/utils/v2/overrides.sh

create_tool_path > /dev/null

mkdir /cache "/usr/local/${TOOL_NAME}"
mkdir /cache

echo "APT::Install-Recommends \"false\";" | tee -a /etc/apt/apt.conf.d/99buildpack.conf
echo "APT::Get::Upgrade \"false\";" | tee -a /etc/apt/apt.conf.d/99buildpack.conf
Expand Down Expand Up @@ -54,6 +55,8 @@ export DEBIAN_FRONTEND=noninteractive
# zlib1g-dev \
# ;

bash <(curl -L https://nixos.org/nix/install) --no-daemon

git clone https://github.com/NixOS/nix.git


Expand Down

0 comments on commit 4bfd58c

Please sign in to comment.