about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Hodapp <hodapp87@gmail.com>2016-12-31 14:59:30 -0500
committerChris Hodapp <hodapp87@gmail.com>2016-12-31 14:59:30 -0500
commite3dedd4b57755153cb7e904720aa1ff18557bb3e (patch)
treed22612c760d195ccfd0029d922c38a61578efc1f
parent61027b7fcea9aef25b5a61700ccb21788365645f (diff)
downloadnixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar.gz
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar.bz2
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar.lz
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar.xz
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.tar.zst
nixlib-e3dedd4b57755153cb7e904720aa1ff18557bb3e.zip
darktable: 2.0.7 -> 2.2.0
-rw-r--r--pkgs/applications/graphics/darktable/default.nix14
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index a9ad0210baa1..ea5113246ba9 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -11,12 +11,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "2.0.7";
+  version = "2.2.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9";
+    sha256 = "3eca193831faae58200bb1cb6ef29e658bce43a81706b54420953a7c33d79377";
   };
 
   buildInputs =
@@ -34,6 +34,16 @@ stdenv.mkDerivation rec {
     "-DBUILD_USERMANUAL=False"
   ];
 
+  # darktable changed its rpath handling in commit
+  # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the
+  # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in
+  # the wrappers:
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable"
+    )
+  '';
+  
   meta = with stdenv.lib; {
     description = "Virtual lighttable and darkroom for photographers";
     homepage = https://www.darktable.org;