colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awesome: pull upstream fix for -fno-common toolchains

Browse Source 
Without the change build fails as:

    ld: CMakeFiles/awesome.dir/objects/window.c.o:/build/source/build/common/lualib.h:31:
      multiple definition of `lualib_dofunction_on_error';
        CMakeFiles/awesome.dir/awesome.c.o:/build/source/build/common/lualib.h:31: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-14 09:10:53 +01:00
parent 197681059f
commit 6595bdb30e
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/window-managers/awesome/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv, fetchFromGitHub, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
{ lib, stdenv, fetchFromGitHub, fetchpatch
, lua, cairo, librsvg, cmake, imagemagick, pkg-config, gdk-pixbuf
, xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
, xcb-util-cursor, makeWrapper, pango, gobject-introspection
, which, dbus, nettools, git, doxygen
@ -27,6 +28,21 @@ stdenv.mkDerivation rec {
sha256 = "1i7ajmgbsax4lzpgnmkyv35x8vxqi0j84a14k6zys4blx94m9yjf";
};
patches = [
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/awesomeWM/awesome/pull/3065
(fetchpatch {
name = "fno-common-prerequisite.patch";
url = "https://github.com/awesomeWM/awesome/commit/c5202a48708585cc33528065af8d1b1d28b1a6e0.patch";
sha256 = "0sv36xf0ibjcm63gn9k3bl039sqavb2b5i6d65il4bdclkc0n08b";
})
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0.patch";
sha256 = "1n3y4wnjra8blss7642jgpxnm9n92zhhjj541bb9i60m4b7bgfzz";
})
];
nativeBuildInputs = [
cmake
doxygen