diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-12 02:06:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-12 02:06:02 +0200 |
commit | eec6b13fb66b524cb29c05c4cc7127065b9edd29 (patch) | |
tree | 9be847b9de2ba044c3a5a885e4ab92df92ab20f1 /pkgs | |
parent | c21f0a2653a38fa1f60de1dcdf245b81e697d01f (diff) | |
parent | a3251fb2e0ade5c4d83d41108cbabc6c79f2bd7e (diff) | |
download | nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar.gz nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar.bz2 nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar.lz nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar.xz nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.tar.zst nixpkgs-eec6b13fb66b524cb29c05c4cc7127065b9edd29.zip |
Merge pull request #118936 from alyssais/motif
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch | 19 | ||||
-rw-r--r-- | pkgs/development/libraries/motif/default.nix | 35 |
2 files changed, 18 insertions, 36 deletions
diff --git a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch b/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch deleted file mode 100644 index d91e43ba2d3..00000000000 --- a/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/demos/programs/workspace/xrmLib.c -+++ b/demos/programs/workspace/xrmLib.c -@@ -30,7 +30,14 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6 1995/07/14 10:01:41 drk $" - #endif - - #include <stdio.h> --#include <malloc.h> -+#if defined(__cplusplus) || defined(__STDC__) || defined(__EXTENSIONS__) -+# include <stdlib.h> -+# if defined(HAVE_MALLOC_H) -+# include <malloc.h> -+# elif defined(HAVE_SYS_MALLOC_H) -+# include <sys/malloc.h> -+# endif -+#endif - #include <Xm/Xm.h> - #include "wsm.h" - #include "wsmDebug.h" - diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index 0499aaec532..f99bd8f2630 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libtool +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libtool , xlibsWrapper, xbitmaps, libXrender, libXmu, libXt , expat, libjpeg, libpng, libiconv , flex @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "motif"; - version = "2.3.6"; + version = "2.3.8"; src = fetchurl { url = "mirror://sourceforge/motif/${pname}-${version}.tar.gz"; - sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs"; + sha256 = "1rxwkrhmj8sfg7dwmkhq885valwqbh26d79033q7vb7fcqv756w5"; }; buildInputs = [ @@ -26,26 +26,27 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXp libXau ]; - hardeningDisable = [ "format" ]; - - makeFlags = [ "CFLAGS=-fno-strict-aliasing" ]; - - prePatch = '' - rm lib/Xm/Xm.h - '' + lib.optionalString (!demoSupport) '' + prePatch = lib.optionalString (!demoSupport) '' sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in} ''; - patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch - ./Use-correct-header-for-malloc.patch - ./Add-X.Org-to-bindings-file.patch - ]; + patches = [ + ./Remove-unsupported-weak-refs-on-darwin.patch + ./Add-X.Org-to-bindings-file.patch + (fetchpatch rec { + name = "fix-format-security.patch"; + url = "https://raw.githubusercontent.com/void-linux/void-packages/b9a1110dabb01c052dadc1abae1413bd4afe3652/srcpkgs/motif/patches/02-${name}"; + sha256 = "13vzpf8yxvhf4gl7q0yzlr6ak1yzx382fsqsrv5lc8jbbg4nwrrq"; + }) + ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; - platforms = with platforms; linux ++ darwin; - license = with licenses; [ lgpl21 ]; - maintainers = with maintainers; [ ]; + platforms = platforms.unix; + license = with licenses; [ lgpl21Plus ]; + maintainers = with maintainers; [ qyliss ]; }; } |