diff options
| author | Artturi <Artturin@artturin.com> | 2022-05-08 15:06:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 15:06:25 +0300 |
| commit | 7854686295abbbe74497dc6c2c7f42130388804c (patch) | |
| tree | 881e73aa653e4d1342bbd44e60371a808ce74891 /pkgs/tools | |
| parent | 14818cc7b29b636ea08cc93a5e9cf57201ceffc1 (diff) | |
| parent | 5b50f0de1d5e01c11bf612ed1ca468a645fc161b (diff) | |
Merge pull request #172033 from trofi/fix-fno-common-for-xnee
xnee: pull fix pending upstream inclusion for -fno-common toolchain s…
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/X11/xnee/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 00ebb1ecec23e..d2236dfe354eb 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst +{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst , gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { @@ -10,7 +10,17 @@ stdenv.mkDerivation rec { sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; - patchPhase = + patches = [ + # Pull fix pending upstream inclusion for -fno-common + # toolchain support: https://savannah.gnu.org/bugs/?58810 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; + sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + }) + ]; + + postPatch = '' for i in `find cnee/test -name \*.sh` do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' |