b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #176067 from trofi/fix-fno-common-for-xannotate

Browse source 
xannotate: pull patch pending upstream inclusion for -fno-common tool…
This commit is contained in:
Sandro 2022-06-03 17:04:54 +02:00 committed by GitHub
parent 6dcaf4e873 add1b2e9af
commit 720611a5d6
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/xannotate/default.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchFromBitbucket, libX11}:
{lib, stdenv, fetchFromBitbucket, fetchpatch, libX11}:
stdenv.mkDerivation rec {
pname = "xannotate";
version = "20150301";
@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
};
patches = [
# Pull patch pending upstream inclusion for -gno-common tollchains:
# https://github.com/blais/xannotate/pull/1
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/blais/xannotate/commit/ee637e2dee103d0e654865c2202ea1b3af2a20d6.patch";
sha256 = "1lw22d5qs1bwp53l332yl3yypfvwrbi750wp7yv90nfn3ia0xhni";
})
];
buildInputs = [ libX11 ];
meta = {
@ -17,6 +27,6 @@ stdenv.mkDerivation rec {
license = lib.licenses.gpl2Plus ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
homepage = "https://bitbucket.org/blais/xannotate";
homepage = "https://github.com/blais/xannotate";
};
}