ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 14:57:28 +03:00
Code Issues Projects Releases Wiki Activity

gmic-qt: 2.3.6 → 2.7.1

Browse Source
This commit is contained in:
Jan Tojnar 2019-09-07 16:53:01 +02:00
parent 01e7149af6
commit 7a0f2fc3a0
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/tools/graphics/gmic-qt/default.nix
View File

@ -4,6 +4,7 @@
, fetchpatch , fetchpatch
, variant ? "standalone" , variant ? "standalone"
, fetchFromGitHub , fetchFromGitHub
, fetchFromGitLab
, cmake , cmake
, pkgconfig , pkgconfig
, opencv , opencv
@ -19,7 +20,6 @@
, gimp ? null , gimp ? null
, qtbase , qtbase
, qttools , qttools
, fetchgit
}: }:
let let
@ -52,7 +52,7 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps
mkDerivation rec { mkDerivation rec {
pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}"; pname = "gmic-qt${lib.optionalString (variant != "standalone") ''-${variant}''}";
version = "2.3.6"; version = "2.7.1";
gmic-community = fetchFromGitHub { gmic-community = fetchFromGitHub {
owner = "dtschump"; owner = "dtschump";
@ -61,46 +61,35 @@ mkDerivation rec {
sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2"; sha256 = "08d37b49qgh5d4rds7hvr5wjj4p1y8cnbidz1cyqsibq0555pwq2";
}; };
CImg = fetchgit { CImg = fetchFromGitLab {
url = "https://framagit.org/dtschump/CImg"; domain = "framagit.org";
rev = "90f5657d8eab7b549ef945103ef680e747385805"; owner = "dtschump";
sha256 = "1af3dwqq18dkw0lz2gvnlw8y0kc1cw01hnc72rf3pg2wyjcp0pvc"; repo = "CImg";
rev = "v.${version}";
sha256 = "1mfkjvf5r3ppc1dd6yvqn7xlhgzfg9k1k5v2sq2k9m70g8p7rgpd";
}; };
gmic_stdlib = fetchurl { gmic_stdlib = fetchurl {
name = "gmic_stdlib.h"; name = "gmic_stdlib.h";
# Version should e in sync with gmic. Basically the version string without dots url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h";
url = "http://gmic.eu/gmic_stdlib236.h"; sha256 = "0v12smknr1s44s6wq2gbnw0hb98xrwp6i3zg9wf49cl7s9qf76j3";
sha256 = "0q5g87dsn9byd2qqsa9xrsggfb9qv055s3l2gc0jrcvpx2qbza4q";
}; };
gmic = fetchFromGitHub { gmic = fetchFromGitHub {
owner = "dtschump"; owner = "dtschump";
repo = "gmic"; repo = "gmic";
rev = "v.${version}"; rev = "v.${version}";
sha256 = "1yg9ri3n07drv8gz4x0mn39ryi801ibl26jaza47m19ma893m8fi"; sha256 = "0pa6kflr1gqgzh8rk7bylvkxs989r5jy0q7b62mnzx8895slwfb5";
}; };
gmic_qt = fetchFromGitHub { gmic_qt = fetchFromGitHub {
owner = "c-koi"; owner = "c-koi";
repo = "gmic-qt"; repo = "gmic-qt";
rev = "v.${version}"; rev = "v.${version}";
sha256 = "0j9wqlq67dwzir36yg58xy5lbblwizvgcvlmzcv9d6l901d5ayf3"; sha256 = "08a0660083wv5fb1w9qqhm4f8cfwbqq723qzqq647mid1n7sy959";
}; };
patches = [ patches = [
# Add install targets
(fetchpatch {
url = https://github.com/c-koi/gmic-qt/commit/ec4babbaf06a8711a4fd841f7de4106cda765109.patch;
sha256 = "1rim6vjx3k0yw8mplq8ampb2ykfabjj6d8vynmp8lm6n8id99yr0";
})
# Fix translations installation
(fetchpatch {
url = https://github.com/c-koi/gmic-qt/commit/91f92ba589d6559541d5dfacf39dab4e0faaa106.patch;
sha256 = "1kh39349qcna386lx80kgj87xxlyh95xmwnv539z4zqnpzyqdxfs";
})
# Install GIMP plug-in to a correct destination # Install GIMP plug-in to a correct destination
# https://github.com/c-koi/gmic-qt/pull/78 # https://github.com/c-koi/gmic-qt/pull/78
./fix-gimp-plugin-path.patch ./fix-gimp-plugin-path.patch
@ -118,10 +107,6 @@ mkDerivation rec {
cd gmic_qt cd gmic_qt
''; '';
preConfigure = ''
make -C ../gmic/src CImg.h gmic_stdlib.h
'';
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkgconfig pkgconfig