pyrox.dev
Merge pull request #99403 from woffs/uudeview-format
uudeview: don't hardeningDisable format
authored by
Silvan Mosberger
and committed by
GitHub
d46295c6
bede9fcb
+22
-6
pkgs/tools/misc/uudeview/default.nix
+22
-6
pkgs/tools/misc/uudeview/default.nix
···
1
-
{ lib, stdenv, fetchurl, tcl, tk }:
1
+
{ lib
2
+
, stdenv
3
+
, fetchurl
4
+
, fetchpatch
5
+
, tcl
6
+
, tk
7
+
}:
2
8
3
9
stdenv.mkDerivation rec {
4
10
pname = "uudeview";
5
11
version = "0.5.20";
12
+
6
13
src = fetchurl {
7
-
url = "http://www.fpx.de/fp/Software/UUDeview/download/uudeview-${version}.tar.gz";
14
+
url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz";
8
15
sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4";
9
16
};
10
17
11
18
buildInputs = [ tcl tk ];
12
-
hardeningDisable = [ "format" ];
19
+
13
20
configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ];
14
21
15
-
# https://wiki.tcl.tk/3577
16
-
patches = [ ./matherr.patch ];
22
+
patches = [
23
+
# https://wiki.tcl.tk/3577
24
+
./matherr.patch
25
+
# format hardening
26
+
(fetchpatch {
27
+
url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch";
28
+
sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw";
29
+
extraPrefix = "";
30
+
})
31
+
];
32
+
17
33
postPatch = ''
18
34
substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish"
19
35
'';
···
21
37
meta = {
22
38
description = "The Nice and Friendly Decoder";
23
39
homepage = "http://www.fpx.de/fp/Software/UUDeview/";
24
-
license = lib.licenses.gpl2;
40
+
license = lib.licenses.gpl2Plus;
25
41
maintainers = with lib.maintainers; [ woffs ];
26
42
platforms = lib.platforms.linux;
27
43
};