diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-05-08 15:01:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 15:01:36 +0000 |
| commit | 1dff38cae5b9764b467196d60520e1e3be419a93 (patch) | |
| tree | 738f89739e64ea3bb981c51190e6c000151bf8d3 /pkgs | |
| parent | 33de02043db9144861d17579fdd98b6c702154de (diff) | |
| parent | bab57833d0821139d8a124df20d514c8a877bd0e (diff) | |
Merge pull request #122154 from jnetod/zhf-xneur
xneur: fix build with gcc10
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/xneur/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index bb4e1727f69ff..2d8af0465a772 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -21,6 +21,14 @@ stdenv.mkDerivation { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; + patches = [ + (fetchpatch { + name = "gcc-10.patch"; + url = "https://salsa.debian.org/debian/xneur/-/raw/da38ad9c8e1bf4e349f5ed4ad909f810fdea44c9/debian/patches/gcc-10.patch"; + sha256 = "0pc17a4sdrnrc4z7gz28889b9ywqsm5mzm6m41h67j2f5zh9k3fy"; + }) + ]; + postPatch = '' sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure ''; |