From 7af2d07f244cdd785d79a698428f3ffaf597b58b Mon Sep 17 00:00:00 2001 From: Christopher Poole Date: Tue, 7 Oct 2014 16:36:30 +1100 Subject: [PATCH 1/2] Added the dlib machine learning library. --- pkgs/development/libraries/dlib/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/libraries/dlib/default.nix diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix new file mode 100644 index 000000000000..8dfc91a125fe --- /dev/null +++ b/pkgs/development/libraries/dlib/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cmake, x11 }: + +stdenv.mkDerivation rec { + version = "18.10"; + name = "dlib-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2"; + sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7"; + }; + + # The supplied CMakeLists.txt does not have any install targets. + sources_var = "\$\{sources\}"; + headers_var = "\$\{hearders\}"; + preConfigure = '' + cat << EOF > CMakeLists.txt + cmake_minimum_required(VERSION 2.6 FATAL_ERROR) + project(dlib) + + include_directories(./) + + file(GLOB sources ./dlib/all/*.cpp) + file(GLOB headers ./dlib/*.h) + + SET(LIBRARY_OUTPUT_PATH ".") + add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var}) + + install(TARGETS dlib DESTINATION lib) + install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h") + EOF + ''; + + enableParallelBuilding = true; + buildInputs = [ cmake x11 ]; + propagatedBuildInputs = [ x11 ]; + + meta = { + description = "Dlib is a general purpose cross-platform C++ machine learning library."; + homepage = http://www.dlib.net; + license = stdenv.lib.licenses.boost; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7c44d1d7fd3..ad3fd64af52f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4806,6 +4806,8 @@ let directfb = callPackage ../development/libraries/directfb { }; + dlib = callPackage ../development/libraries/dlib { }; + dotconf = callPackage ../development/libraries/dotconf { }; dssi = callPackage ../development/libraries/dssi {}; From f3b8324fc5c99a9cfe127c71d81ac62a863aa6bd Mon Sep 17 00:00:00 2001 From: Christopher Poole Date: Fri, 10 Oct 2014 10:18:42 +1100 Subject: [PATCH 2/2] Added Christopher Poole to the list of dlib package maintainers. --- lib/maintainers.nix | 1 + pkgs/development/libraries/dlib/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c75bfdc0c67..329a2fe8de06 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -37,6 +37,7 @@ cdepillabout = "Dennis Gosnell "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; + christopherpoole = "Christopher Mark Poole "; coconnor = "Corey O'Connor "; copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 8dfc91a125fe..94f74e516f1b 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake x11 ]; propagatedBuildInputs = [ x11 ]; - meta = { + meta = with stdenv.lib; { description = "Dlib is a general purpose cross-platform C++ machine learning library."; homepage = http://www.dlib.net; license = stdenv.lib.licenses.boost; - maintainers = [ ]; + maintainers = with maintainers; [ christopherpoole ]; platforms = stdenv.lib.platforms.all; }; }