windows: makeScope -> makeScopeWithSplicing (#447492) (73eeb857) · Commits · nix / nixpkgs

pkgs/os-specific/windows/default.nix

+44 −38

Original line number	Diff line number	Diff line
		@@ -3,16 +3,22 @@
		config,
		stdenv,
		buildPackages,
		pkgs,
		pkgsHostTarget,
		newScope,
		overrideCC,
		stdenvNoLibc,
		emptyDirectory,
		libc,
		makeScopeWithSplicing',
		generateSplicesForMkScope,
		}:

		lib.makeScope newScope (
		makeScopeWithSplicing' {
		otherSplices = generateSplicesForMkScope "windows";
		f =
		self:
		with self;
		let
		inherit (self) callPackage;
		in
		{
		dlfcn = callPackage ./dlfcn { };

		@@ -27,23 +33,23 @@ lib.makeScope newScope (
		else
		buildPackages.gccWithoutTargetLibc.override (old: {
		bintools = old.bintools.override {
		libc = pkgs.pkgsHostTarget.libc;
		noLibc = pkgs.libc == null;
		libc = pkgsHostTarget.libc;
		noLibc = libc == null;
		nativeLibc = false;
		};
		libc = pkgs.pkgsHostTarget.libc;
		noLibc = pkgs.libc == null;
		libc = pkgsHostTarget.libc;
		noLibc = libc == null;
		nativeLibc = false;
		})
		);

		mingw_w64_headers = callPackage ./mingw-w64/headers.nix { };

		mcfgthreads = callPackage ./mcfgthreads { stdenv = crossThreadsStdenv; };
		mcfgthreads = callPackage ./mcfgthreads { stdenv = self.crossThreadsStdenv; };

		npiperelay = callPackage ./npiperelay { };

		pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = crossThreadsStdenv; };
		pthreads = callPackage ./mingw-w64/pthreads.nix { stdenv = self.crossThreadsStdenv; };

		libgnurx = callPackage ./libgnurx { };

		@@ -51,5 +57,5 @@ lib.makeScope newScope (
		}
		// lib.optionalAttrs config.allowAliases {
		mingw_w64_pthreads = lib.warn "windows.mingw_w64_pthreads is deprecated, windows.pthreads should be preferred" self.pthreads;
		};
		}
		)