minimal-bootstrap.musl11: init at 1.1.24 (913e70d7) · Commits · nix / nixpkgs

pkgs/os-specific/linux/minimal-bootstrap/default.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,13 @@ lib.makeScope
		mes = lib.recurseIntoAttrs (callPackage ./mes { });
		mes-libc = callPackage ./mes/libc.nix { };

		musl11 = callPackage ./musl/1.1.nix {
		bash = bash_2_05;
		tinycc = tinycc-mes;
		gnused = gnused-mes;
		gawk = gawk-mes;
		};

		musl = callPackage ./musl {
		gcc = gcc46;
		gawk = gawk-mes;

pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix

0 → 100644

+116 −0

Original line number	Diff line number	Diff line
		{ lib
		, buildPlatform
		, hostPlatform
		, fetchurl
		, bash
		, tinycc
		, gnumake
		, gnupatch
		, gnused
		, gnugrep
		, gawk
		, gnutar
		, gzip
		}:

		let
		inherit (import ./common.nix { inherit lib; }) pname meta;
		version = "1.1.24";

		src = fetchurl {
		url = "https://musl.libc.org/releases/musl-${version}.tar.gz";
		hash = "sha256-E3DJqBKyzyp9koAlEMygBYzDfmanvt1wBR8KNAFQIqM=";
		};

		# Thanks to the live-bootstrap project!
		# See https://github.com/fosslinux/live-bootstrap/blob/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24/musl-1.1.24.sh
		liveBootstrap = "https://github.com/fosslinux/live-bootstrap/raw/d98f97e21413efc32c770d0356f1feda66025686/sysa/musl-1.1.24";
		patches = [
		(fetchurl {
		url = "${liveBootstrap}/patches/avoid_set_thread_area.patch";
		hash = "sha256-TsbBZXk4/KMZG9EKi7cF+sullVXrxlizLNH0UHGXsPs=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/avoid_sys_clone.patch";
		hash = "sha256-/ZmH64J57MmbxdfQ4RNjamAiBdkImMTlHsHdgV4gMj4=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/fenv.patch";
		hash = "sha256-vMVGjoN4deAJW5gsSqA207SJqAbvhrnOsGK49DdEiTI=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/makefile.patch";
		hash = "sha256-03iYBAUnsrEdLIIhhhq5mM6BGnPn2EfUmIHu51opxbw=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/musl_weak_symbols.patch";
		hash = "sha256-/d9a2eUkpe9uyi1ye6T4CiYc9MR3FZ9na0Gb90+g4v0=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/set_thread_area.patch";
		hash = "sha256-RIZYqbbRSx4X/0iFUhriwwBRmoXVR295GNBUjf2UrM0=";
		})
		(fetchurl {
		url = "${liveBootstrap}/patches/sigsetjmp.patch";
		hash = "sha256-wd2Aev1zPJXy3q933aiup5p1IMKzVJBquAyl3gbK4PU=";
		})
		# FIXME: this patch causes the build to fail
		# (fetchurl {
		# url = "${liveBootstrap}/patches/stdio_flush_on_exit.patch";
		# hash = "sha256-/z5ze3h3QTysay8nRvyvwPv3pmTcKptdkBIaMCoeLDg=";
		# })
		(fetchurl {
		url = "${liveBootstrap}/patches/va_list.patch";
		hash = "sha256-UmcMIl+YCi3wIeVvjbsCyqFlkyYsM4ECNwTfXP+s7vg=";
		})
		];
		in
		bash.runCommand "${pname}-${version}" {
		inherit pname version meta;

		nativeBuildInputs = [
		tinycc.compiler
		gnumake
		gnupatch
		gnused
		gnugrep
		gawk
		gnutar
		gzip
		];
		} ''
		# Unpack
		tar xzf ${src}
		cd musl-${version}

		# Patch
		${lib.concatMapStringsSep "\n" (f: "patch -Np0 -i ${f}") patches}
		# tcc does not support complex types
		rm -rf src/complex
		# Configure fails without this
		mkdir -p /dev
		# https://github.com/ZilchOS/bootstrap-from-tcc/blob/2e0c68c36b3437386f786d619bc9a16177f2e149/using-nix/2a3-intermediate-musl.nix
		sed -i 's\|/bin/sh\|${bash}/bin/bash\|' \
		tools/*.sh
		chmod 755 tools/*.sh
		# patch popen/system to search in PATH instead of hardcoding /bin/sh
		sed -i 's\|posix_spawn(&pid, "/bin/sh",\|posix_spawnp(\&pid, "sh",\|' \
		src/stdio/popen.c src/process/system.c
		sed -i 's\|execl("/bin/sh", "sh", "-c",\|execlp("sh", "-c",\|'\
		src/misc/wordexp.c

		# Configure
		bash ./configure \
		--prefix=$out \
		--build=${buildPlatform.config} \
		--host=${hostPlatform.config} \
		--disable-shared \
		CC=tcc

		# Build
		make AR="tcc -ar" RANLIB=true CFLAGS="-DSYSCALL_NO_TLS"

		# Install
		make install
		cp ${tinycc.libs}/lib/libtcc1.a $out/lib
		''

pkgs/os-specific/linux/minimal-bootstrap/musl/common.nix

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		{ lib }:

		{
		pname = "musl";

		meta = with lib; {
		description = "An efficient, small, quality libc implementation";
		homepage = "https://musl.libc.org";
		license = licenses.mit;
		maintainers = teams.minimal-bootstrap.members;
		platforms = platforms.unix;
		};
		}

pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix

+2 −10

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		, gzip
		}:
		let
		pname = "musl";
		inherit (import ./common.nix { inherit lib; }) pname meta;
		version = "1.2.4";

		src = fetchurl {
		@@ -22,7 +22,7 @@ let
		};
		in
		bash.runCommand "${pname}-${version}" {
		inherit pname version;
		inherit pname version meta;

		nativeBuildInputs = [
		gcc
		@@ -50,14 +50,6 @@ bash.runCommand "${pname}-${version}" {
		./test
		mkdir $out
		'';

		meta = with lib; {
		description = "An efficient, small, quality libc implementation";
		homepage = "https://musl.libc.org";
		license = licenses.mit;
		maintainers = teams.minimal-bootstrap.members;
		platforms = platforms.unix;
		};
		} ''
		# Unpack
		tar xzf ${src}

Admin message