nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge pull request #204671 from t-gebauer/fix/bumblebee

bumblebee: fix build with GCC 10

authored by

figsoda and committed by
GitHub
eaf57733 1ad2011d

+5 -3
+5 -3
pkgs/tools/X11/bumblebee/default.nix
··· 52 52 url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; 53 53 sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; 54 54 }; 55 + gcc10Patch = fetchpatch { 56 + url = "https://github.com/Bumblebee-Project/Bumblebee/commit/f94a118a88cd76e2dbea33d735bd53cf54b486a1.patch"; 57 + hash = "sha256-3b5tLoMrGYSdg9Hz5bh0c44VIrbSZrY56JpWEyU/Pik="; 58 + }; 55 59 56 60 in stdenv.mkDerivation rec { 57 61 pname = "bumblebee"; ··· 71 67 72 68 modprobePatch 73 69 libkmodPatch 70 + gcc10Patch 74 71 ]; 75 72 76 73 # By default we don't want to use a display device ··· 142 137 license = licenses.gpl3; 143 138 maintainers = with maintainers; [ abbradar ]; 144 139 platforms = platforms.linux; 145 - # linking fails with multiple error of type: 146 - # multiple definition of `bb_pm_method_string'; src/module.o:(.bss+0x0): first defined here 147 - broken = true; # Added 03-08-2022 148 140 }; 149 141 }