Loading pkgs/development/libraries/lensfun/default.nix +18 −8 Original line number Diff line number Diff line { lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: { lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: let version = "0.3.95"; version = "0.3.3"; pname = "lensfun"; # Fetch a more recent version of the repo containing a more recent lens Loading @@ -9,8 +9,8 @@ let lensfunDatabase = fetchFromGitHub { owner = "lensfun"; repo = "lensfun"; rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d"; sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic="; }; in Loading @@ -21,16 +21,26 @@ stdenv.mkDerivation { owner = "lensfun"; repo = "lensfun"; rev = "v${version}"; sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; }; # replace database with a more recent snapshot # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, # so we run the conversion tool the project provides, # then untar the verson 1 profiles into the source dir before we build prePatch = '' rm -R ./data/db cp -R ${lensfunDatabase}/data/db ./data rm -R data/db python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db mkdir -p data/db tar xvf $TMPDIR/db/version_1.tar -C data/db date +%s > data/db/timestamp.txt ''; nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config python3 python3.pkgs.lxml # For the db converison ]; buildInputs = [ glib zlib libpng ]; cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; Loading Loading
pkgs/development/libraries/lensfun/default.nix +18 −8 Original line number Diff line number Diff line { lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }: { lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: let version = "0.3.95"; version = "0.3.3"; pname = "lensfun"; # Fetch a more recent version of the repo containing a more recent lens Loading @@ -9,8 +9,8 @@ let lensfunDatabase = fetchFromGitHub { owner = "lensfun"; repo = "lensfun"; rev = "4672d765a17bfef7bc994ca7008cb717c61045d5"; sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41"; rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d"; sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic="; }; in Loading @@ -21,16 +21,26 @@ stdenv.mkDerivation { owner = "lensfun"; repo = "lensfun"; rev = "v${version}"; sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r"; sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; }; # replace database with a more recent snapshot # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, # so we run the conversion tool the project provides, # then untar the verson 1 profiles into the source dir before we build prePatch = '' rm -R ./data/db cp -R ${lensfunDatabase}/data/db ./data rm -R data/db python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db mkdir -p data/db tar xvf $TMPDIR/db/version_1.tar -C data/db date +%s > data/db/timestamp.txt ''; nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config python3 python3.pkgs.lxml # For the db converison ]; buildInputs = [ glib zlib libpng ]; cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ]; Loading