cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #210536 from wegank/lensfun-darwin

Browse source 
lensfun: fix build on x86_64-darwin
This commit is contained in:
Florian Klink 2023-01-13 14:25:42 +00:00 committed by GitHub
commit a0d4f92b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/lensfun/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }: { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, glib, zlib, libpng, cmake, libxml2, python3 }:
let let
version = "0.3.3"; version = "0.3.3";
@ -24,6 +24,14 @@ stdenv.mkDerivation {
sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz"; sha256 = "0ixf0f7qv0mc7zrw9w1sb60w833g4rqrfj8cjxwzv2vimqcksccz";
}; };
patches = [
(fetchpatch {
name = "fix-compilation-with-clang.patch";
url = "https://github.com/lensfun/lensfun/commit/5c2065685a22f19f8138365c0e5acf0be8329c02.patch";
sha256 = "sha256-tAOCNL37pKE7hfQCu+hUTKLFnRHWF5Dplqf+GaucG+4=";
})
];
# replace database with a more recent snapshot # replace database with a more recent snapshot
# the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles, # the mastr branch uses version 2 profiles, while 0.3.3 requires version 1 profiles,
# so we run the conversion tool the project provides, # so we run the conversion tool the project provides,