git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21433 from Hodapp87/darktable-2.2.0
d7a65bdGraham Christensen
pkgs/applications/graphics/darktable/default.nix+12−2
compare with master
unifiedsplit
@@ -11,12 +11,12 @@
11assert stdenv ? glibc;
11assert stdenv ? glibc;
12
12
13stdenv.mkDerivation rec {
13stdenv.mkDerivation rec {
14− version = "2.0.7";
14+ version = "2.2.0";
15 name = "darktable-${version}";
15 name = "darktable-${version}";
16
16
17 src = fetchurl {
17 src = fetchurl {
18 url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
18 url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
19− sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9";
19+ sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
20 };
20 };
21
21
22 buildInputs =
22 buildInputs =
@@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
34 "-DBUILD_USERMANUAL=False"
34 "-DBUILD_USERMANUAL=False"
35 ];
35 ];
36
36
37+ # darktable changed its rpath handling in commit
38+ # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
39+ # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
40+ # the wrappers:
41+ preFixup = ''
42+ gappsWrapperArgs+=(
43+ --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
44+ )
45+ '';
46+
37 meta = with stdenv.lib; {
47 meta = with stdenv.lib; {
38 description = "Virtual lighttable and darkroom for photographers";
48 description = "Virtual lighttable and darkroom for photographers";
39 homepage = https://www.darktable.org;
49 homepage = https://www.darktable.org;