diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-09-03 15:22:13 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-07 17:04:29 +0300 |
commit | eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209 (patch) | |
tree | 7e689991c292acefece9059e72e1b4b897b0cbf0 /pkgs/development/libraries/dlib/default.nix | |
parent | e5059a8739ee93ee7c7cf12ed605443615f7496d (diff) | |
download | nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar.gz nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar.bz2 nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar.lz nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar.xz nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.tar.zst nixpkgs-eb6a8c3f527d7b8bd7dc579ca028e40c52a3e209.zip |
dlib: 19.4 -> 19.6
Diffstat (limited to 'pkgs/development/libraries/dlib/default.nix')
-rw-r--r-- | pkgs/development/libraries/dlib/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index fe4e7907c9f..61932b29e62 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, openblas, libpng, libjpeg +, guiSupport ? false, libX11 +}: stdenv.mkDerivation rec { - version = "19.4"; + version = "19.6"; name = "dlib-${version}"; src = fetchFromGitHub { owner = "davisking"; repo = "dlib"; rev ="v${version}"; - sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4"; + sha256 = "1nlx4z53jnk7wysaxrzbyyqb65m45rw4g1fagazl2jvwh1qn49ds"; }; + postPatch = '' + rm -rf dlib/external + ''; + enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ openblas libpng libjpeg ] ++ lib.optional guiSupport libX11; meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; |