From 2756b33d07ced66570bb584b8fe9398ee3179ab8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 13:46:05 -0300 Subject: [PATCH] ftgl: 2.1.3-rc5 -> 2.4.0 --- pkgs/development/libraries/ftgl/default.nix | 33 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 5588e27356f..466ffcbb73a 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,28 +1,42 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook +, doxygen +, freeglut , freetype +, GLUT , libGL , libGLU , OpenGL +, pkg-config }: stdenv.mkDerivation rec { pname = "ftgl"; - version = "2.1.3-rc5"; + version = "2.4.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}-${version}.tar.gz"; - hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls="; + src = fetchFromGitHub { + owner = "frankheckenbach"; + repo = "ftgl"; + rev = "v${version}"; + hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; }; + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ]; buildInputs = [ freetype ] ++ (if stdenv.isDarwin then [ OpenGL + GLUT ] else [ libGL libGLU + freeglut ]); configureFlags = [ @@ -31,8 +45,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL + install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL + ''; + meta = with lib; { - homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; + homepage = "https://github.com/frankheckenbach/ftgl"; description = "Font rendering library for OpenGL applications"; longDescription = '' FTGL is a free cross-platform Open Source C++ library that uses Freetype2 @@ -40,7 +59,7 @@ stdenv.mkDerivation rec { pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering modes. ''; - license = licenses.gpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da1e9d3457..62d644faad8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4639,7 +4639,7 @@ in frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; }; ftop = callPackage ../os-specific/linux/ftop { };