nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

Merge pull request #214207 from Artturin/ssytemdbuildbash1


authored by

Artturi and committed by
GitHub
fa169bb2 938a52f6

+12 -3
+12 -3
pkgs/os-specific/linux/systemd/default.nix
··· 3 3 { stdenv 4 4 , lib 5 5 , nixosTests 6 + , pkgsCross 6 7 , fetchFromGitHub 7 8 , fetchpatch 8 9 , fetchzip ··· 64 63 , withKexectools ? lib.meta.availableOn stdenv.hostPlatform kexec-tools 65 64 , kexec-tools 66 65 , bashInteractive 66 + , bash 67 67 , libmicrohttpd 68 68 , libfido2 69 69 , p11-kit ··· 141 139 # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' 142 140 releaseTimestamp = "1667246393"; 143 141 in 144 - stdenv.mkDerivation { 142 + stdenv.mkDerivation (finalAttrs: { 145 143 inherit pname version; 146 144 147 145 # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly ··· 341 339 # when cross-compiling. 342 340 + '' 343 341 shopt -s extglob 344 - patchShebangs tools test src/!(rpm) 342 + patchShebangs tools test src/!(rpm|kernel-install) src/kernel-install/test-kernel-install.sh 345 343 ''; 346 344 347 345 outputs = [ "out" "man" "dev" ]; ··· 364 362 docbook_xsl 365 363 docbook_xml_dtd_42 366 364 docbook_xml_dtd_45 365 + bash 367 366 (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) 368 367 ] 369 368 ++ lib.optionals withLibBPF [ ··· 385 382 libuuid 386 383 linuxHeaders 387 384 pam 385 + bashInteractive # for patch shebangs 388 386 ] 389 387 390 388 ++ lib.optionals wantGcrypt [ libgcrypt libgpg-error ] ··· 698 694 mv $out/dont-strip-me $out/lib/systemd/boot/efi 699 695 ''; 700 696 697 + disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) 698 + # 'or p' is for manually specified buildPackages as they dont have __spliced 699 + (builtins.map (p: p.__spliced.buildHost or p) finalAttrs.nativeBuildInputs); 700 + 701 701 passthru = { 702 702 # The interface version prevents NixOS from switching to an 703 703 # incompatible systemd at runtime. (Switching across reboots is ··· 715 707 716 708 tests = { 717 709 inherit (nixosTests) switchTest; 710 + cross = pkgsCross.aarch64-multiplatform.systemd; 718 711 }; 719 712 }; 720 713 ··· 730 721 priority = 10; 731 722 maintainers = with maintainers; [ flokli kloenk mic92 ]; 732 723 }; 733 - } 724 + })