ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-04 09:56:13 +03:00
Code Issues Projects Releases Wiki Activity

gpg-mdp: pull patch pending upstream inclusion for -fno-common toolchains

Browse Source 
Without the change build fails as:

    ld: editor.o:(.bss+0x8): multiple definition of `cfg_character_set'; config.o:(.bss+0x20): first defined here
    ld: editor.o:(.bss+0x10): multiple definition of `cfg_character_count'; config.o:(.data+0x10): first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-14 16:40:33 +01:00
parent 197681059f
commit e098c562b3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/gpg-mdp/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, lib, stdenv, ncurses, gnupg }:
{ fetchurl, fetchpatch, lib, stdenv, ncurses, gnupg }:
let version = "0.7.4";
in stdenv.mkDerivation {
@ -14,6 +14,15 @@ in stdenv.mkDerivation {
url = "https://tamentis.com/projects/mdp/files/mdp-${version}.tar.gz";
sha256 = "04mdnx4ccpxf9m2myy9nvpl9ma4jgzmv9bkrzv2b9affzss3r34g";
};
patches = [
# Pull fix pending upstream inclusion for -fno-common toolchain support:
# https://github.com/tamentis/mdp/pull/9
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/tamentis/mdp/commit/95c77de3beb96dc7c76ff36d3f3dfb18411d7c54.patch";
sha256 = "1j6yvjzkx31b758yav4arhlm5ig7phl8mgx4fcwj7lm2pfvzwcsz";
})
];
buildInputs = [ ncurses ];
prePatch = ''
substituteInPlace ./configure \