colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darktable: 4.6.1 -> 4.8.0

Browse Source
This commit is contained in:
Mica Semrick 2024-06-21 15:26:54 -07:00
parent 1cbcd750d6
commit 135767c763
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/graphics/darktable/default.nix
View File

@ -56,19 +56,14 @@
}:
stdenv.mkDerivation rec {
version = "4.6.1";
version = "4.8.0";
pname = "darktable";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "sha256-Fu3AoHApPi082k6hDkm9qb3pMuI/nmLi+i56x0rPev0=";
sha256 = "sha256-QZhJ6QFScOQHXyNBxrVTLT0czMz6jxlZLLLqOtF/klU=";
};
patches = [
./fix_darwin_x86_compile.patch
];
nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ];
buildInputs = [

22
pkgs/applications/graphics/darktable/fix_darwin_x86_compile.patch
View File

@ -1,22 +0,0 @@
From 1620befa933fbe525d8851a8f465db9926b7a588 Mon Sep 17 00:00:00 2001
From: Mario Zimmermann <mail@zisoft.de>
Date: Wed, 14 Feb 2024 22:18:42 +0100
Subject: [PATCH] fix xcode compiler segfault
---
src/common/darktable.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/darktable.h b/src/common/darktable.h
index e5bd1a28902c..2c43b4878bcf 100644
--- a/src/common/darktable.h
+++ b/src/common/darktable.h
@@ -140,7 +140,7 @@ extern "C" {
/* Create cloned functions for various CPU SSE generations */
/* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */
/* TL;DR : use only on SIMD functions containing low-level paralellized/vectorized loops */
-#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH)
+#if __has_attribute(target_clones) && !defined(_WIN32) && !defined(NATIVE_ARCH) && !defined(__APPLE__)
# if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64)
#define __DT_CLONE_TARGETS__ __attribute__((target_clones("default", "sse2", "sse3", "sse4.1", "sse4.2", "popcnt", "avx", "avx2", "avx512f", "fma4")))
# elif defined(__PPC64__)