From 4b1bcf8724c1b9a9409a88e930c10f0a50d19b1d Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 8 Aug 2017 09:57:10 +0100 Subject: [PATCH 1/2] pangolin: init at 2017-08-02 --- .../libraries/pangolin/default.nix | 54 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/pangolin/default.nix diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix new file mode 100644 index 00000000000..f5b2f4c2b99 --- /dev/null +++ b/pkgs/development/libraries/pangolin/default.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg +, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: + +stdenv.mkDerivation rec { + name = "pangolin-${version}"; + + version = "2017-08-02"; + + src = fetchFromGitHub { + owner = "stevenlovegrove"; + repo = "Pangolin"; + rev = "f05a8cdc4f0e32cc1664a430f1f85e60e233c407"; + sha256 = "0pfbaarlsw7f7cmsppm7m13nz0k530wwwyczy2l9k448p3v7x9j0"; + }; + + nativeBuildInputs = [ cmake pkgconfig doxygen ]; + + buildInputs = [ + mesa_noglu + glew + xorg.libX11 + ffmpeg + python3 + libjpeg + libpng + libtiff + eigen + ]; + + enableParallelBuilding = true; + + # The tests use cmake's findPackage to find the installed version of + # pangolin, which isn't what we want (or available). + doCheck = false; + cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + + meta = { + description = "A lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; + longDescription = '' + Pangolin is a lightweight portable rapid development library for managing + OpenGL display / interaction and abstracting video input. At its heart is + a simple OpenGl viewport manager which can help to modularise 3D + visualisation without adding to its complexity, and offers an advanced + but intuitive 3D navigation handler. Pangolin also provides a mechanism + for manipulating program variables through config files and ui + integration, and has a flexible real-time plotter for visualising + graphical data. + ''; + homepage = https://github.com/stevenlovegrove/Pangolin; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dd9427c2ce..eb0ee3bc767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8179,6 +8179,9 @@ with pkgs; cairomm = callPackage ../development/libraries/cairomm { }; pango = callPackage ../development/libraries/pango { }; + + pangolin = callPackage ../development/libraries/pangolin { }; + pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; From 7cd44aeeef932551c2b3d5ba41e5897115103b2c Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 9 Aug 2017 22:14:23 +0100 Subject: [PATCH 2/2] pangolin: fix OS X build --- pkgs/development/libraries/pangolin/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index f5b2f4c2b99..09cbd86eb92 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg -, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, Carbon ? null, Cocoa ? null +}: stdenv.mkDerivation rec { name = "pangolin-${version}"; @@ -25,7 +27,8 @@ stdenv.mkDerivation rec { libpng libtiff eigen - ]; + ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0ee3bc767..996691fa435 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8180,7 +8180,9 @@ with pkgs; pango = callPackage ../development/libraries/pango { }; - pangolin = callPackage ../development/libraries/pangolin { }; + pangolin = callPackage ../development/libraries/pangolin { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices;