ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-26 23:27:29 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20220 from NeQuissimus/darktable_a7

Browse Source 
Update Darktable, dependencies
This commit is contained in:
Tim Steinbach 2016-11-08 09:10:31 -05:00 committed by GitHub
commit 54a0e90a7c
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,12 @@
assert stdenv ? glibc;
stdenv.mkDerivation rec {
version = "2.0.6";
version = "2.0.7";
name = "darktable-${version}";
src = fetchurl {
url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
sha256 = "1h9qwxyvcv0fc6y5b6l2x4jd5mmw026blhjkcihj00r1aa3c2s13";
sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9";
};
buildInputs =

13
pkgs/development/libraries/lensfun/default.nix
View File

@ -1,16 +1,15 @@
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }:
{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }:
stdenv.mkDerivation rec {
name = "lensfun-0.2.8";
version = "0.3.2";
name = "lensfun-${version}";
src = fetchurl {
url = "mirror://sourceforge/lensfun/${name}.tar.bz2";
sha256 = "0j0smagnksdm9gjnk13w200hjxshmxf2kvyxxnra4nc2qzxrg3zq";
url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz";
sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf";
};
patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure";
buildInputs = [ pkgconfig glib zlib libpng gnumake3 ];
buildInputs = [ pkgconfig glib zlib libpng cmake gnumake3 ];
configureFlags = "-v";

20
pkgs/development/libraries/libgphoto2/default.nix
View File

@ -1,21 +1,24 @@
{ stdenv, fetchurl, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext }:
{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
stdenv.mkDerivation rec {
name = "libgphoto2-${meta.version}";
src = fetchurl {
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
sha256 = "1wjf79ipqwb5phfjjwf15rwgigakylnfqaj4crs5qnds6ba6i1ld";
src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = "${meta.tag}";
sha256 = "17k3jxib2jcr2wk83p34h3lvvjbs2gqhqfcngm8zmlrwb385yalh";
};
patches = [(fetchurl {
patches = [(fetchpatch {
name = "libjpeg_turbo_1.5.0_fix.patch";
url = "https://anonscm.debian.org/cgit/pkg-phototools/libgphoto2.git/plain"
+ "/debian/patches/libjpeg_turbo_1.5.0_fix.patch?id=8ce79a2a02d";
sha256 = "114iyhk6idxz2jhnzpf1glqm6d0x0y8cqfpqxz9i96q9j7x3wwin";
sha256 = "1zclgg20nv4krj8gigq3ylirxqiv1v8p59cfji041m156hy80gy2";
})];
nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ libtool libjpeg libusb1 ];
nativeBuildInputs = [ pkgconfig gettext autoreconfHook ];
buildInputs = [ libtool libjpeg libusb1 ];
# These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [ libexif ];
@ -31,6 +34,7 @@ stdenv.mkDerivation rec {
from digital cameras.
'';
version = "2.5.10";
tag = "libgphoto2-2_5_10-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;