Merge pull request #120461 from alyssais/netbsd-common

netbsd.common: just export the sources

authored by John Ericson and committed by GitHub a78ed5cb 068a59a3

+7 -12
+7 -12
pkgs/os-specific/bsd/netbsd/default.nix
··· 479 479 makeMinimal 480 480 install mandoc groff nbperf rpcgen 481 481 ]; 482 - extraPaths = with self; [ common.src ]; 482 + extraPaths = with self; [ common ]; 483 483 headersOnly = true; 484 484 noCC = true; 485 485 meta.platforms = lib.platforms.netbsd; 486 486 makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; 487 487 }; 488 488 489 - common = mkDerivation { 490 - path = "common"; 491 - version = "8.0"; 492 - sha256 = "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; 493 - noCC = true; 494 - }; 489 + common = fetchNetBSD "common" "8.0" "1fsm2b7p7zkhiz523jw75088cq2h39iknp0fp3di9a64bikwbhi1"; 495 490 496 491 sys-headers = mkDerivation { 497 492 pname = "sys-headers"; ··· 527 522 ''; 528 523 529 524 meta.platforms = lib.platforms.netbsd; 530 - extraPaths = with self; [ common.src ]; 525 + extraPaths = with self; [ common ]; 531 526 532 527 installPhase = "includesPhase"; 533 528 dontBuild = true; ··· 564 559 path = "lib/libutil"; 565 560 version = "8.0"; 566 561 sha256 = "077syyxd303m4x7avs5nxzk4c9n13d5lyk5aicsacqjvx79qrk3i"; 567 - extraPaths = with self; [ common.src libc.src sys.src ]; 562 + extraPaths = with self; [ common libc.src sys.src ]; 568 563 nativeBuildInputs = with buildPackages.netbsd; [ 569 564 bsdSetupHook 570 565 makeMinimal ··· 678 673 version = "8.0"; 679 674 sha256 = "078qsi4mg1hyyxr1awvjs9b0c2gicg3zw4vl603g1m9vm8gfxw9l"; 680 675 meta.platforms = lib.platforms.netbsd; 681 - extraPaths = with self; [ common.src libc.src ]; 676 + extraPaths = with self; [ common libc.src ]; 682 677 postPatch = '' 683 678 sed -i 's,/usr\(/include/sys/syscall.h\),${self.headers}\1,g' \ 684 679 $BSDSRCDIR/lib/{libc,librt}/sys/Makefile.inc ··· 710 705 noCC = false; 711 706 dontBuild = false; 712 707 buildInputs = with self; [ headers ]; 713 - extraPaths = with self; [ common.src libc.src sys.src ]; 708 + extraPaths = with self; [ common libc.src sys.src ]; 714 709 }; 715 710 716 711 libresolv = mkDerivation { ··· 773 768 USE_FORT = "yes"; 774 769 MKPROFILE = "no"; 775 770 extraPaths = with self; [ 776 - common.src i18n_module.src sys.src 771 + common i18n_module.src sys.src 777 772 ld_elf_so.src libpthread.src libm.src libresolv.src 778 773 librpcsvc.src libutil.src librt.src libcrypt.src 779 774 ];