summary refs log tree commit diff
path: root/lib/systems
diff options
context:
space:
mode:
authorRyan Burns <rtburns@protonmail.com>2021-08-18 21:39:21 -0700
committerRyan Burns <rtburns@protonmail.com>2021-08-18 21:52:14 -0700
commit525c69e724f0280da983e2db8c27aa16bcaa6189 (patch)
treee1314f76d68e017fc2896ea87363d70cf3ec4f84 /lib/systems
parentdb3e6d7a2c1b9f1d5b404cff4db2fbad5147af6e (diff)
downloadnixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar.gz
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar.bz2
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar.lz
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar.xz
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.tar.zst
nixpkgs-525c69e724f0280da983e2db8c27aa16bcaa6189.zip
lib/systems: fix scaleway-c1 platform
This regressed in 9c213398b312e0f0bb9cdf05090fd20223a82ad0

The recursiveUpdate gave the platform both gcc.cpu and gcc.arch attrs
instead of only gcc.cpu. This is invalid; gcc configuration fails with:

```
Switch "--with-arch" may not be used with switch "--with-cpu"
```

So we revert to using `//` to retain only gcc.cpu
(which is more specific than the processor arch).
Diffstat (limited to 'lib/systems')
-rw-r--r--lib/systems/platforms.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index d7efe84e2b8..2a5f630c3de 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -233,7 +233,7 @@ rec {
     };
   };
 
-  scaleway-c1 = lib.recursiveUpdate armv7l-hf-multiplatform {
+  scaleway-c1 = armv7l-hf-multiplatform // {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";