motif: 2.3.6 -> 2.3.8; clarify license; adopt
This commit is contained in:
parent
c1c617ff8d
commit
8edca5ad79
@ -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"
|
||||
|
@ -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 = [
|
||||
@ -28,24 +28,21 @@ stdenv.mkDerivation rec {
|
||||
|
||||
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
|
||||
];
|
||||
];
|
||||
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user