diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-29 15:51:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-29 15:51:06 +0000 |
| commit | 64756b041dd53527be7cc9c930d78b92e03865f3 (patch) | |
| tree | 08ece8e0076b709272d8269f016bb8bcfc73be01 /pkgs/applications/window-managers | |
| parent | 7c59ac9ddccd461ca057cbc6864b7bc2509171ac (diff) | |
| parent | 6595bdb30e564c8ad97c12333130791509cf0f14 (diff) | |
| download | nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar.gz nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar.bz2 nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar.lz nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar.xz nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.tar.zst nixpkgs-64756b041dd53527be7cc9c930d78b92e03865f3.zip | |
Merge pull request #172992 from trofi/fix-fno-common-for-awesome
awesome: pull upstream fix for -fno-common toolchains
Diffstat (limited to 'pkgs/applications/window-managers')
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 90b559e7d44..b19f17275ad 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -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 |