mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Updating digikam to 4.6.0 and adding libpgf.

Browse source 
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1)
This commit is contained in:
Lluís Batlle i Rossell 2015-01-23 10:26:00 +01:00
parent 8dd230aa09
commit 205e338a83
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/graphics/digikam/default.nix
View file

@ -1,21 +1,21 @@
{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
shared_desktop_ontologies, marble, mysql }:
shared_desktop_ontologies, marble, mysql, libpgf }:
stdenv.mkDerivation rec {
name = "digikam-4.4.0";
name = "digikam-4.6.0";
src = fetchurl {
url = "http://download.kde.org/stable/digikam/${name}.tar.bz2";
sha256 = "1sflh3i989f9xi4qym3rzcrx7ahrjf1n9si8c5q05dgm039a4s2w";
sha256 = "0id3anikki8c3rzqzapdbg00h577qwybknvkbz1kdq0348bs6ixh";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql ];
opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql libpgf ];
# Make digikam find some FindXXXX.cmake
KDEDIRS="${marble}:${qjson}";

27
pkgs/development/libraries/libpgf/default.nix Normal file
View file

@ -0,0 +1,27 @@
{ stdenv, fetchurl, autoconf, automake, libtool, dos2unix }:
with stdenv.lib;
let
version = "6.14.12";
in
stdenv.mkDerivation {
name = "libpgf-${version}";
src = fetchurl {
url = "mirror://sourceforge/libpgf/libpgf-src-${version}.tar.gz";
sha256 = "1ssqjbh6l5jc04f67n47m9bqcigl46c6lgyabyi6cabnh1frk9dx";
};
buildInputs = [ autoconf automake libtool dos2unix ];
preConfigure = "dos2unix configure.ac; sh autogen.sh";
# configureFlags = optional static "--enable-static --disable-shared";
meta = {
homepage = http://www.libpgf.org/;
description = "Progressive Graphics Format";
license = stdenv.lib.licenses.lgpl21Plus;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -6294,6 +6294,8 @@ let
libpipeline = callPackage ../development/libraries/libpipeline { };
libpgf = callPackage ../development/libraries/libpgf { };
libpng = callPackage ../development/libraries/libpng { };
libpng_apng = libpng.override { apngSupport = true; };
libpng12 = callPackage ../development/libraries/libpng/12.nix { };