Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dlib: 18.10 -> 19.4 #23796

Merged
merged 1 commit into from
Mar 12, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 10 additions & 30 deletions pkgs/development/libraries/dlib/default.nix
Original file line number Diff line number Diff line change
@@ -1,45 +1,25 @@
{ stdenv, fetchurl, cmake, xlibsWrapper }:
{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }:

stdenv.mkDerivation rec {
version = "18.10";
version = "19.4";
name = "dlib-${version}";

src = fetchurl {
url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2";
sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7";
src = fetchFromGitHub {
owner = "davisking";
repo = "dlib";
rev ="v${version}";
sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4";
};

# 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 xlibsWrapper ];
propagatedBuildInputs = [ xlibsWrapper ];
nativeBuildInputs = [ cmake ];

meta = with stdenv.lib; {
description = "A general purpose cross-platform C++ machine learning library";
homepage = http://www.dlib.net;
license = stdenv.lib.licenses.boost;
license = licenses.boost;
maintainers = with maintainers; [ christopherpoole ];
platforms = stdenv.lib.platforms.all;
platforms = platforms.all;
};
}