ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 05:37:40 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
bumblebee: fix build with GCC 10
This commit is contained in:
figsoda 2022-12-06 11:13:25 -05:00 committed by GitHub
commit eaf5773377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/X11/bumblebee/default.nix
View File

@ -52,6 +52,10 @@ let
url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch"; url = "https://github.com/Bumblebee-Project/Bumblebee/commit/deceb14cdf2c90ff64ebd1010a674305464587da.patch";
sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh"; sha256 = "00c05i5lxz7vdbv445ncxac490vbl5g9w3vy3gd71qw1f0si8vwh";
}; };
gcc10Patch = fetchpatch {
url = "https://github.com/Bumblebee-Project/Bumblebee/commit/f94a118a88cd76e2dbea33d735bd53cf54b486a1.patch";
hash = "sha256-3b5tLoMrGYSdg9Hz5bh0c44VIrbSZrY56JpWEyU/Pik=";
};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "bumblebee"; pname = "bumblebee";
@ -67,6 +71,7 @@ in stdenv.mkDerivation rec {
modprobePatch modprobePatch
libkmodPatch libkmodPatch
gcc10Patch
]; ];
# By default we don't want to use a display device # By default we don't want to use a display device
@ -137,8 +142,5 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux; 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
}; };
} }