forked from mirrors/nixpkgs
Merge pull request #99403 from woffs/uudeview-format
uudeview: don't hardeningDisable format
This commit is contained in:
commit
d46295c60d
|
@ -1,19 +1,35 @@
|
|||
{ lib, stdenv, fetchurl, tcl, tk }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, tcl
|
||||
, tk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "uudeview";
|
||||
version = "0.5.20";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
|
||||
url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz";
|
||||
sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
|
||||
};
|
||||
|
||||
buildInputs = [ tcl tk ];
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ];
|
||||
|
||||
# https://wiki.tcl.tk/3577
|
||||
patches = [ ./matherr.patch ];
|
||||
patches = [
|
||||
# https://wiki.tcl.tk/3577
|
||||
./matherr.patch
|
||||
# format hardening
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
|
||||
sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
|
||||
extraPrefix = "";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
|
||||
'';
|
||||
|
@ -21,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
meta = {
|
||||
description = "The Nice and Friendly Decoder";
|
||||
homepage = "http://www.fpx.de/fp/Software/UUDeview/";
|
||||
license = lib.licenses.gpl2;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ woffs ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue