Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging] linux.stdenv: gcc_10 → gcc_11 #165732

Merged
merged 6 commits into from
Mar 26, 2022
Merged

[staging] linux.stdenv: gcc_10 → gcc_11 #165732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
52f8cf5
linux.stdenv: gcc_10 → gcc_11
fabianhjr Mar 24, 2022
5267c0e
exempi: pin boots/gccStdenv versions due to compilation errors with m…
fabianhjr Mar 25, 2022
cdbe5e9
pmdk: 1.9.2 → 1.11.1
fabianhjr Mar 25, 2022
c24ffe3
rlottie: add upstream gcc11 patch
fabianhjr Mar 25, 2022
9464bf0
glm: `-no-strict-aliasing` due to upstream bug
fabianhjr Mar 26, 2022
7481d51
glog: disable parallel checking due to errors
fabianhjr Mar 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkgs/development/libraries/glm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ stdenv.mkDerivation rec {

nativeBuildInputs = [ cmake ];

# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102823
NIX_CFLAGS_COMPILE = "-fno-ipa-modref";

cmakeFlags = [
"-DBUILD_SHARED_LIBS=OFF"
"-DBUILD_STATIC_LIBS=OFF"
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/libraries/glog/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ stdenv.mkDerivation rec {

# TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed
doCheck = !stdenv.isDarwin;
# There are some non-thread safe tests that can fail
enableParallelChecking = false;
checkInputs = [ perl ];

meta = with lib; {
Expand Down
6 changes: 4 additions & 2 deletions pkgs/development/libraries/pmdk/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

stdenv.mkDerivation rec {
pname = "pmdk";
version = "1.9.2";
version = "1.11.1";

src = fetchFromGitHub {
owner = "pmem";
repo = "pmdk";
rev = "refs/tags/${version}";
sha256 = "0awmkj6j9y2pbqqmp9ql00s7qa3mnpppa82dfy5324lindq0z8a1";
hash = "sha256-8bnyLtgkKfgIjJkfY/ZS1I9aCYcrz0nrdY7m/TUVWAk=";
};

nativeBuildInputs = [ autoconf pkg-config gnum4 pandoc ];
Expand All @@ -21,6 +21,8 @@ stdenv.mkDerivation rec {

patchPhase = "patchShebangs utils";

NIX_CFLAGS_COMPILE = "-Wno-error";

installPhase = ''
make install prefix=$out

Expand Down
17 changes: 16 additions & 1 deletion pkgs/development/libraries/rlottie/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }:
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, meson
, ninja
, pkg-config
}:

stdenv.mkDerivation rec {
pname = "rlottie";
Expand All @@ -11,6 +18,14 @@ stdenv.mkDerivation rec {
sha256 = "10bxr1zf9wxl55d4cw2j02r6sgqln7mbxplhhfvhw0z92fi40kr3";
};

patches = [
# Fixed build with GCC 11
(fetchpatch {
url = "https://github.com/Samsung/rlottie/commit/2d7b1fa2b005bba3d4b45e8ebfa632060e8a157a.patch";
hash = "sha256-2JPsj0WiBMMu0N3NUYDrHumvPN2YS8nPq5Zwagx6UWE=";
})
];

nativeBuildInputs = [ meson ninja pkg-config ];

meta = with lib; {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5330,7 +5330,8 @@ with pkgs;
};

exempi = callPackage ../development/libraries/exempi {
stdenv = if stdenv.isi686 then gcc6Stdenv else stdenv;
stdenv = if stdenv.isi686 then gcc6Stdenv else gcc9Stdenv;
boost = boost15x;
};

execline = skawarePackages.execline;
Expand Down Expand Up @@ -12137,6 +12138,7 @@ with pkgs;
num =
if (with stdenv.targetPlatform; isVc4 || libc == "relibc") then 6
else if (stdenv.targetPlatform.isAarch64 && stdenv.isDarwin) then 11
else if (stdenv.targetPlatform.isx86_64 && stdenv.isLinux) then 11
vcunat marked this conversation as resolved.
Show resolved Hide resolved
else if stdenv.targetPlatform.isAarch64 then 9
else 10;
numS = toString num;
Expand Down