libqglviewer: 2.6.3 -> 2.7.1

This transitions from Qt4 to Qt5.
This commit is contained in:
Ben Wolsieffer 2019-05-17 23:49:05 -04:00
parent 619492c03e
commit f22a561402
2 changed files with 14 additions and 14 deletions

View File

@ -1,25 +1,25 @@
{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: { stdenv, fetchurl, qmake, qtbase, libGLU, AGL }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libqglviewer-2.6.3"; pname = "libqglviewer";
version = "2.6.3"; version = "2.7.1";
src = fetchurl { src = fetchurl {
url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz";
}; };
buildInputs = [ qt4 qmake4Hook ] nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase libGLU ]
++ stdenv.lib.optional stdenv.isDarwin AGL; ++ stdenv.lib.optional stdenv.isDarwin AGL;
postPatch = postPatch = ''
'' cd QGLViewer
cd QGLViewer '';
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
homepage = http://libqglviewer.com/; homepage = "http://libqglviewer.com";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.all; platforms = platforms.all;
}; };

View File

@ -11538,10 +11538,6 @@ in
libplist = callPackage ../development/libraries/libplist { }; libplist = callPackage ../development/libraries/libplist { };
libqglviewer = callPackage ../development/libraries/libqglviewer {
inherit (darwin.apple_sdk.frameworks) AGL;
};
libre = callPackage ../development/libraries/libre {}; libre = callPackage ../development/libraries/libre {};
librem = callPackage ../development/libraries/librem {}; librem = callPackage ../development/libraries/librem {};
@ -12771,6 +12767,10 @@ in
libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { };
libqglviewer = callPackage ../development/libraries/libqglviewer {
inherit (darwin.apple_sdk.frameworks) AGL;
};
libqtav = callPackage ../development/libraries/libqtav { }; libqtav = callPackage ../development/libraries/libqtav { };
kpmcore = callPackage ../development/libraries/kpmcore { }; kpmcore = callPackage ../development/libraries/kpmcore { };