Merge pull request #175997 from patricksjackson/vaapi-intel-hybrid-fno-common

vaapi-intel-hybrid: add -fcommon workaround
2022-06-03 20:42:33 +02:00
parent 381f34e35c e9774b7d82
commit 4ea7b82adb
1 changed files with 4 additions and 1 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
  version = "1.0.2";

  src = fetchFromGitHub {
-    owner = "01org";
+    owner = "intel";
    repo = "intel-hybrid-driver";
    rev = version;
    sha256 = "sha256-uYX7RoU1XVzcC2ea3z/VBjmT47xmzK67Y4LaiFXyJZ8=";
@@ -25,6 +25,9 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  # Workaround build failure on -fno-common toolchains like upstream gcc-10.
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
  configureFlags = [
    "--enable-drm"
    "--enable-x11"