mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-29 08:38:18 +03:00
opencsg: 1.4.2 -> 1.6.0
This commit is contained in:
parent
817a592c92
commit
8dd5c21550
@ -2,11 +2,11 @@
|
|||||||
, qmake, GLUT, fixDarwinDylibNames }:
|
, qmake, GLUT, fixDarwinDylibNames }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.4.2";
|
version = "1.6.0";
|
||||||
pname = "opencsg";
|
pname = "opencsg";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
|
url = "http://www.opencsg.org/OpenCSG-${version}.tar.gz";
|
||||||
sha256 = "1ysazynm759gnw1rdhn9xw9nixnzrlzrc462340a6iif79fyqlnr";
|
hash = "sha256-v4+4Dj4M4R2H3XjdFaDehy27iXLYf1+Jz/xGHvrUe+g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ qmake ]
|
nativeBuildInputs = [ qmake ]
|
||||||
@ -18,15 +18,13 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
patches = [ ./fix-pro-files.patch ];
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
rm example/Makefile src/Makefile
|
rm example/Makefile src/Makefile
|
||||||
qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
|
qmakeFlags=("''${qmakeFlags[@]}" "INSTALLDIR=$out")
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
install -D license.txt "$out/share/doc/opencsg/license.txt"
|
install -D copying.txt "$out/share/doc/opencsg/copying.txt"
|
||||||
'' + lib.optionalString stdenv.isDarwin ''
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
mkdir -p $out/Applications
|
mkdir -p $out/Applications
|
||||||
mv $out/bin/*.app $out/Applications
|
mv $out/bin/*.app $out/Applications
|
||||||
@ -49,7 +47,7 @@ stdenv.mkDerivation rec {
|
|||||||
homepage = "http://www.opencsg.org/";
|
homepage = "http://www.opencsg.org/";
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
maintainers = [ maintainers.raskin ];
|
maintainers = [ maintainers.raskin ];
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,21 +0,0 @@
|
|||||||
diff -ur OpenCSG-1.4.2-pristine/example/example.pro OpenCSG-1.4.2/example/example.pro
|
|
||||||
--- OpenCSG-1.4.2-pristine/example/example.pro 2016-09-27 06:11:16.000000000 +0900
|
|
||||||
+++ OpenCSG-1.4.2/example/example.pro 2019-05-07 10:45:18.785251737 +0900
|
|
||||||
@@ -6,7 +6,9 @@
|
|
||||||
INCLUDEPATH += ../include
|
|
||||||
LIBS += -L../lib -lopencsg -lGLEW
|
|
||||||
|
|
||||||
-INSTALLDIR = /usr/local
|
|
||||||
+isEmpty(INSTALLDIR) {
|
|
||||||
+ INSTALLDIR = /usr/local
|
|
||||||
+}
|
|
||||||
INSTALLS += target
|
|
||||||
target.path = $$INSTALLDIR/bin
|
|
||||||
|
|
||||||
diff -ur OpenCSG-1.4.2-pristine/opencsg.pro OpenCSG-1.4.2/opencsg.pro
|
|
||||||
--- OpenCSG-1.4.2-pristine/opencsg.pro 2016-09-27 06:11:16.000000000 +0900
|
|
||||||
+++ OpenCSG-1.4.2/opencsg.pro 2019-05-07 10:44:50.578698165 +0900
|
|
||||||
@@ -1,2 +1,3 @@
|
|
||||||
TEMPLATE = subdirs
|
|
||||||
SUBDIRS = src example
|
|
||||||
+CONFIG += ordered
|
|
Loading…
Reference in New Issue
Block a user