From 17d340091ecdcd65c25915dacd7ca40ea6ae24c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 2 Sep 2022 12:47:09 +0700 Subject: [PATCH] nix: do not touch outside {build,dest}dir While we're at it, cross compile --- ...anual-build-without-nix-installation.patch | 35 +++++++++ .../nix/patches/0002-manual-cross-build.patch | 76 +++++++++++++++++++ srcpkgs/nix/template | 13 +++- 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch create mode 100644 srcpkgs/nix/patches/0002-manual-cross-build.patch diff --git a/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch new file mode 100644 index 000000000000..0b47cf987765 --- /dev/null +++ b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch @@ -0,0 +1,35 @@ +From 80e23e10c854e54a1231b2fede26a44acaf8cee4 Mon Sep 17 00:00:00 2001 +Message-Id: <80e23e10c854e54a1231b2fede26a44acaf8cee4.1662096893.git.congdanhqx@gmail.com> +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Fri, 2 Sep 2022 10:33:10 +0700 +Subject: [PATCH 1/2] manual: build without nix installation + +--- + doc/manual/local.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index 371ed6f21..81f91c8b0 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -85,14 +85,14 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages + $(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@) + + doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli +- @mkdir -p $(DESTDIR)$$(dirname $@) ++ @mkdir -p $$(dirname $@) + $(trace-gen) for i in doc/manual/src/command-ref/new-cli/*.md; do \ + name=$$(basename $$i .md); \ + tmpFile=$$(mktemp); \ + if [[ $$name = SUMMARY ]]; then continue; fi; \ + printf "Title: %s\n\n" "$$name" > $$tmpFile; \ + cat $$i >> $$tmpFile; \ +- lowdown -sT man -M section=1 $$tmpFile -o $(DESTDIR)$$(dirname $@)/$$name.1; \ ++ lowdown -sT man -M section=1 $$tmpFile -o $$(dirname $@)/$$name.1; \ + rm $$tmpFile; \ + done + @touch $@ +-- +2.37.2.587.g219fe53025.dirty + diff --git a/srcpkgs/nix/patches/0002-manual-cross-build.patch b/srcpkgs/nix/patches/0002-manual-cross-build.patch new file mode 100644 index 000000000000..b504b33ce60e --- /dev/null +++ b/srcpkgs/nix/patches/0002-manual-cross-build.patch @@ -0,0 +1,76 @@ +From 8434469b5ba6ce1f631e3815cf8b92cdb719d732 Mon Sep 17 00:00:00 2001 +Message-Id: <8434469b5ba6ce1f631e3815cf8b92cdb719d732.1662096893.git.congdanhqx@gmail.com> +In-Reply-To: <80e23e10c854e54a1231b2fede26a44acaf8cee4.1662096893.git.congdanhqx@gmail.com> +References: <80e23e10c854e54a1231b2fede26a44acaf8cee4.1662096893.git.congdanhqx@gmail.com> +From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= + +Date: Fri, 2 Sep 2022 12:05:18 +0700 +Subject: [PATCH 2/2] manual: cross-build + +--- + doc/manual/local.mk | 26 ++++++++++++++++---------- + 1 file changed, 16 insertions(+), 10 deletions(-) + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index 81f91c8b0..886682bc5 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -20,7 +20,13 @@ dummy-env = env -i \ + NIX_STATE_DIR=/dummy \ + NIX_CONFIG='cores = 0' + +-nix-eval = $(dummy-env) $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw ++ifneq ($(findstring qemu,$(CROSS_EMULATOR)),) ++ _nix-emu := QEMU_LD_PREFIX=${QEMU_LD_PREFIX} $(CROSS_EMULATOR) ++else ++ _nix-emu := $(CROSS_EMULATOR) ++endif ++ ++nix-eval = $(dummy-env) $(_nix-emu) $(nix_DIR)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw + + $(d)/%.1: $(d)/src/command-ref/%.md + @printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp +@@ -44,31 +50,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli + $(trace-gen) cat doc/manual/src/SUMMARY.md.in | while IFS= read line; do if [[ $$line = @manpages@ ]]; then cat doc/manual/src/command-ref/new-cli/SUMMARY.md; else echo "$$line"; fi; done > $@.tmp + @mv $@.tmp $@ + +-$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix ++$(d)/src/command-ref/new-cli: $(d)/nix.json $(d)/generate-manpage.nix $(nix_DIR)/nix + @rm -rf $@ + $(trace-gen) $(nix-eval) --write-to $@ --expr 'import doc/manual/generate-manpage.nix { command = builtins.readFile $<; renderLinks = true; }' + +-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix ++$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(nix_DIR)/nix + @cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp + $(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp + @mv $@.tmp $@ + +-$(d)/nix.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) $(bindir)/nix __dump-args > $@.tmp ++$(d)/nix.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) $(_nix-emu) $(nix_DIR)/nix __dump-args > $@.tmp + @mv $@.tmp $@ + +-$(d)/conf-file.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp ++$(d)/conf-file.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) $(_nix-emu) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp + @mv $@.tmp $@ + +-$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix ++$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix + @cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp + $(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp + @cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp + @mv $@.tmp $@ + +-$(d)/builtins.json: $(bindir)/nix +- $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp ++$(d)/builtins.json: $(nix_DIR)/nix ++ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(_nix-emu) $(nix_DIR)/nix __dump-builtins > $@.tmp + @mv $@.tmp $@ + + # Generate the HTML manual. +-- +2.37.2.587.g219fe53025.dirty + diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 42f983935ba9..6d7724ba7fe1 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -3,11 +3,14 @@ pkgname=nix version=2.10.3 revision=3 build_style=gnu-configure +build_helper=qemu # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/usr/bin/busybox.static" +make_build_args="V=1 SET_RPATH_TO_LIBS=0" +make_install_args="V=1 SET_RPATH_TO_LIBS=0" hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq - busybox-static" + busybox-static lowdown" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel liblzma-devel openssl-devel libsodium-devel sqlite-devel libseccomp-devel editline-devel jq-devel libarchive-devel @@ -20,8 +23,7 @@ homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413 -disable_parallel_build=yes -nocross="cross build populates /usr/lib32 with libraries and tries to link against them" +# disable_parallel_build="build is fine, only linking test" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" @@ -33,6 +35,11 @@ esac CXXFLAGS="-Wno-deprecated-declarations" +if [ "$CROSS_BUILD" ]; then + make_build_args+=" CROSS_EMULATOR=/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" + make_install_args+=" CROSS_EMULATOR=/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" +fi + # Default configuration file. conf_files="/etc/nix/nix.conf" # Create required build users/groups.