pyrox.dev / nixpkgs
lol
fork atom

pommed_light: pull fix pending upstream inclusion for -fno-common toolchains

Without the change builds fails on upstream gcc-10 as:

ld: mactel/nv8600mgt_backlight.o:/build/pommed-light/pommed/mactel/nv8600mgt_backlight.c:50: multiple definition of
`lcd_bck_info'; sysfs_backlight.o:/build/pommed-light/pommed/sysfs_backlight.c:124: first defined here

Sergei Trofimovich 264e99b9 0831857a

+11
unified split
+11
pkgs/os-specific/linux/pommed-light/default.nix
··· 1 { lib, stdenv 2 , fetchFromGitHub 3 , pciutils 4 , libconfuse 5 , alsa-lib ··· 19 rev = "v${version}"; 20 sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; 21 }; 22 23 postPatch = '' 24 substituteInPlace pommed.conf.mactel --replace /usr $out
··· 1 { lib, stdenv 2 , fetchFromGitHub 3 + , fetchpatch 4 , pciutils 5 , libconfuse 6 , alsa-lib ··· 20 rev = "v${version}"; 21 sha256 = "18fvdwwhcl6s4bpf2f2i389s71c8k4g0yb81am9rdddqmzaw27iy"; 22 }; 23 + 24 + patches = [ 25 + # Pull fix pending upstream inclusion for -fno-common toolchain support: 26 + # https://github.com/bytbox/pommed-light/pull/38 27 + (fetchpatch { 28 + name = "fno-common.patch"; 29 + url = "https://github.com/bytbox/pommed-light/commit/5848b49b45a9c3ab047ebd17deb2162daab1e0b8.patch"; 30 + sha256 = "15rsq2i4rqp4ssab20486a1wgxi2cp87b7nxyk9h23gdwld713vf"; 31 + }) 32 + ]; 33 34 postPatch = '' 35 substituteInPlace pommed.conf.mactel --replace /usr $out