diff options
| author | Timo Gebauer <t-gebauer@users.noreply.github.com> | 2022-12-05 20:00:02 +0100 |
|---|---|---|
| committer | Timo Gebauer <t-gebauer@users.noreply.github.com> | 2022-12-06 09:03:55 +0100 |
| commit | eba17ee3be8d487dead9e3014d55811463b0db9a (patch) | |
| tree | 7d5966859e100c9d7d6a73f5ec7456f0c1d82025 | |
| parent | 21aba1cdd2eacd8d6bcc4912e36d6d5849811310 (diff) | |
bumblebee: fix build with GCC 10
Patch from bumblebee develop branch:
https://github.com/Bumblebee-Project/Bumblebee/pull/1071
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 914972d91aa7..0415489bd765 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -52,6 +52,10 @@ let url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; }; + gcc10Patch = fetchpatch { + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/f94a118a88cd76e2dbea33d735bd53cf54b486a1.patch"; + hash = "sha256-3b5tLoMrGYSdg9Hz5bh0c44VIrbSZrY56JpWEyU/Pik="; + }; in stdenv.mkDerivation rec { pname = "bumblebee"; @@ -67,6 +71,7 @@ in stdenv.mkDerivation rec { modprobePatch libkmodPatch + gcc10Patch ]; # By default we don't want to use a display device @@ -137,8 +142,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - # linking fails with multiple error of type: - # multiple definition of `bb_pm_method_string'; src/module.o:(.bss+0x0): first defined here - broken = true; # Added 03-08-2022 }; } |