From 52f8cf58a4504e5e219faebffa51033e400e3aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 24 Mar 2022 11:28:35 -0600 Subject: [PATCH 1/6] =?UTF-8?q?linux.stdenv:=20gcc=5F10=20=E2=86=92=20gcc?= =?UTF-8?q?=5F11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88874afb8c320..5d45586cf43e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12137,6 +12137,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 else if stdenv.targetPlatform.isAarch64 then 9 else 10; numS = toString num; From 5267c0e20ed4e83e1128bc3d118f08201da588a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Thu, 24 Mar 2022 20:20:17 -0600 Subject: [PATCH 2/6] exempi: pin boots/gccStdenv versions due to compilation errors with more recent stdenv --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d45586cf43e1..3f2c67edf8d4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; From cdbe5e98e07c40bfbf671dd6b43e443d07155267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 07:51:52 -0600 Subject: [PATCH 3/6] =?UTF-8?q?pmdk:=201.9.2=20=E2=86=92=201.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/pmdk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 6e0b6ab6722bd..1f02bfa0dab30 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -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 ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { patchPhase = "patchShebangs utils"; + NIX_CFLAGS_COMPILE = "-Wno-error"; + installPhase = '' make install prefix=$out From c24ffe3d5243f0cb77a783af9a2870b61bd364a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 08:07:42 -0600 Subject: [PATCH 4/6] rlottie: add upstream gcc11 patch --- pkgs/development/libraries/rlottie/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rlottie/default.nix b/pkgs/development/libraries/rlottie/default.nix index f1d3ffd02124e..6f641bd6a6006 100644 --- a/pkgs/development/libraries/rlottie/default.nix +++ b/pkgs/development/libraries/rlottie/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +}: stdenv.mkDerivation rec { pname = "rlottie"; @@ -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; { From 9464bf0ad62355cecc709244863e401b15b21812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 18:34:45 -0600 Subject: [PATCH 5/6] glm: `-no-strict-aliasing` due to upstream bug --- pkgs/development/libraries/glm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index 81b0b47d5ba8c..9957df4cdd40a 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -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" From 7481d51589c7a30cc7cc5818dd7281d560b8c4e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Mar 2022 18:39:28 -0600 Subject: [PATCH 6/6] glog: disable parallel checking due to errors --- pkgs/development/libraries/glog/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 72758a1b3e774..f66374f65a319 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -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; {