Skip to content

Commit

Permalink
uudeview: don't hardeningDisable format
Browse files Browse the repository at this point in the history
- adopt a patch which several other distributions use
- name -> pname + version
- license: gpl2Plus
  • Loading branch information
woffs committed Sep 17, 2021
1 parent b93e361 commit 60f8a42
Showing 1 changed file with 22 additions and 6 deletions.
28 changes: 22 additions & 6 deletions pkgs/tools/misc/uudeview/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,43 @@
{ 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"
'';

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;
};
Expand Down

0 comments on commit 60f8a42

Please sign in to comment.