diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-03-13 08:34:50 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-03-13 08:37:41 +0100 |
| commit | b6ae8193edd5fb5188565d6163c86e76a096a500 (patch) | |
| tree | 89587564de4cfc3e4394dcc52f38bafe75a92747 /pkgs/development/compilers/gcc | |
| parent | 285a98eff43b5a9c111cd5d1a227d70495f2c014 (diff) | |
| download | nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar.gz nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar.bz2 nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar.lz nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar.xz nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.tar.zst nixlib-b6ae8193edd5fb5188565d6163c86e76a096a500.zip | |
gcc: minimal hacky fixup for our pkgsi686Linux.nix
This has been blocking nixos-unstable channel through i686 ISO: Fixes #82435, closes #82436. https://hydra.nixos.org/build/114512204
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 7ff8d7529ca3..8dc93a8ae8f4 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -245,6 +245,12 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; + # In this particular combination it stopped creating lib output at all. + # TODO: perhaps find a better fix? (ideally understand what's going on) + postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.isi686 + then ''mkdir "$lib"'' + else null; + meta = { homepage = https://gcc.gnu.org/; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ |