Merge pull request #220735 from wegank/libreoffice-gcc

libreoffice-still: fix build on aarch64-linux
2023-03-12 08:54:23 +02:00
parent feb117e32c 7f436901f1
commit b4c4ece004
1 changed files with 4 additions and 2 deletions
@@ -193,10 +193,12 @@ in

  outputs = [ "out" "dev" ];

-  env.NIX_CFLAGS_COMPILE = toString [
+  env.NIX_CFLAGS_COMPILE = toString ([
    "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h
    "-fno-visibility-inlines-hidden" # https://bugs.documentfoundation.org/show_bug.cgi?id=78174#c10
-  ];
+  ] ++ optionals (stdenv.isLinux && stdenv.isAarch64 && variant == "still") [
+    "-O2" # https://bugs.gentoo.org/727188
+  ]);

  tarballPath = "external/tarballs";