Wroclaw/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Activity

pkgs/overlays/unstable-from-source: remove "emulator" attribute from forwarded platform

Browse source 
https://github.com/NixOS/nixpkgs/pull/324071 broke the overlay
This commit is contained in:
Wroclaw 2024-09-14 19:49:32 +02:00
parent f7e48890cd
commit d4e7760eb8
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/overlays/unstable-from-source.nix
View file

@ -6,10 +6,14 @@ self: super:
let let
useUnstable = self.config.useUnstable or true; useUnstable = self.config.useUnstable or true;
sanitizePlatform = platformConfig: self.lib.removeAttrs platformConfig [
"emulator"
"emulatorAvailable"
];
unstablePkgsForNixpkgs = nixpkgs: import unstableSource { unstablePkgsForNixpkgs = nixpkgs: import unstableSource {
# localSystem -> pkgs.stdenv.buildPlatform # localSystem -> pkgs.stdenv.buildPlatform
localSystem = nixpkgs.stdenv.buildPlatform; localSystem = sanitizePlatform nixpkgs.stdenv.buildPlatform;
# crossSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.targetPlatform ?? # crossSystem -> pkgs.stdenv.hostPlatform or pkgs.stdenv.targetPlatform ??
# passing below # passing below
# config -> pkgs.config # config -> pkgs.config
@ -22,7 +26,7 @@ let
} // (if nixpkgs.stdenv.buildPlatform == nixpkgs.stdenv.hostPlatform then {} else { } // (if nixpkgs.stdenv.buildPlatform == nixpkgs.stdenv.hostPlatform then {} else {
# workaround for some odd structured packages that changes behaviour # workaround for some odd structured packages that changes behaviour
# when crossSystem is passed. # when crossSystem is passed.
crossSystem = nixpkgs.stdenv.hostPlatform; crossSystem = sanitizePlatform nixpkgs.stdenv.hostPlatform;
}); });
in in
{ {