pyrox.dev
Merge pull request #208961 from paperdigits/darktable42
darktable: 4.0.0 -> 4.2.0 & lensfun: 0.3.95 -> 0.3.3
authored by Florian Klink and committed by GitHub 1b0941f6 2ec6e40b
+4
-2
pkgs/applications/graphics/darktable/default.nix
+4
-2
pkgs/applications/graphics/darktable/default.nix
···
27
27
, libpng
28
28
, librsvg
29
29
, libtiff
30
+
, libjxl
30
31
, openexr_3
31
32
, osm-gps-map
32
33
, pkg-config
···
57
58
}:
58
59
59
60
stdenv.mkDerivation rec {
60
-
version = "4.0.0";
61
+
version = "4.2.0";
61
62
pname = "darktable";
62
63
63
64
src = fetchurl {
64
65
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
65
-
sha256 = "0bfcag6bj5vcmg4z4xjirs43iafcx89al6jl41i5mrhpjzszh5hl";
66
+
sha256 = "18b0917fdfe9b09f66c279a681cc3bd52894a566852bbf04b2e179ecfdb11af9";
66
67
};
67
68
68
69
nativeBuildInputs = [ cmake ninja llvm_13 pkg-config intltool perl desktop-file-utils wrapGAppsHook ];
···
83
84
libpng
84
85
librsvg
85
86
libtiff
87
+
libjxl
86
88
openexr_3
87
89
sqlite
88
90
libxslt
+18
-8
pkgs/development/libraries/lensfun/default.nix
+18
-8
pkgs/development/libraries/lensfun/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake }:
1
+
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
2
2
3
3
let
4
-
version = "0.3.95";
4
+
version = "0.3.3";
5
5
pname = "lensfun";
6
6
7
7
# Fetch a more recent version of the repo containing a more recent lens
···
9
9
lensfunDatabase = fetchFromGitHub {
10
10
owner = "lensfun";
11
11
repo = "lensfun";
12
-
rev = "4672d765a17bfef7bc994ca7008cb717c61045d5";
13
-
sha256 = "00x35xhpn55j7f8qzakb6wl1ccbljg1gqjb93jl9w3mha2bzsr41";
12
+
rev = "ec9412d27d5fa8f377848a59c768b12c243cb80d";
13
+
sha256 = "sha256-/u/3oQzac/dQrgFaiYvzT5uQ108XarkXnA2DByA5sic=";
14
14
};
15
15
16
16
in
···
21
21
owner = "lensfun";
22
22
repo = "lensfun";
23
23
rev = "v${version}";
24
-
sha256 = "0isli0arns8bmxqpbr1jnbnqh5wvspixdi51adm671f9ngng7x5r";
24
+
sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz";
25
25
};
26
26
27
27
# replace database with a more recent snapshot
28
+
# the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
29
+
# so we run the conversion tool the project provides,
30
+
# then untar the verson 1 profiles into the source dir before we build
28
31
prePatch = ''
29
-
rm -R ./data/db
30
-
cp -R ${lensfunDatabase}/data/db ./data
32
+
rm -R data/db
33
+
python3 ${lensfunDatabase}/tools/lensfun_convert_db_v2_to_v1.py $TMPDIR ${lensfunDatabase}/data/db
34
+
mkdir -p data/db
35
+
tar xvf $TMPDIR/db/version_1.tar -C data/db
36
+
date +%s > data/db/timestamp.txt
31
37
'';
32
38
33
-
nativeBuildInputs = [ cmake pkg-config ];
39
+
nativeBuildInputs = [
40
+
cmake pkg-config
41
+
python3 python3.pkgs.lxml # For the db converison
42
+
];
43
+
34
44
buildInputs = [ glib zlib libpng ];
35
45
36
46
cmakeFlags = [ "-DINSTALL_HELPER_SCRIPTS=OFF" ];