cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #172033 from trofi/fix-fno-common-for-xnee

Browse source 
xnee: pull fix pending upstream inclusion for -fno-common toolchain s…
This commit is contained in:
Artturi 2022-05-08 15:06:25 +03:00 committed by GitHub
commit 7854686295
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/tools/X11/xnee/default.nix
View file

@ -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'