Merge pull request #165949 from SuperSandro2000/libgpod
This commit is contained in:
commit
10f0e95b0e
|
@ -1,6 +1,7 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac,
|
||||
gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
|
||||
libvorbis, gdk-pixbuf }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, libxml2, curl, flac
|
||||
, gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl
|
||||
, libvorbis, gdk-pixbuf
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2.1.5";
|
||||
|
@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ];
|
||||
buildInputs = [
|
||||
curl gettext
|
||||
flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
|
||||
flex libgpod libid3tag flac libvorbis libxml2 gtk3 gdk-pixbuf
|
||||
gdl gnome.adwaita-icon-theme gnome.anjuta
|
||||
] ++ (with perlPackages; [ perl XMLParser ]);
|
||||
|
||||
|
|
|
@ -17,14 +17,11 @@
|
|||
, autoconf-archive
|
||||
, yelp-tools
|
||||
, mysqlSupport ? false
|
||||
, libmysqlclient ? null
|
||||
, libmysqlclient
|
||||
, postgresSupport ? false
|
||||
, postgresql ? null
|
||||
, postgresql
|
||||
}:
|
||||
|
||||
assert mysqlSupport -> libmysqlclient != null;
|
||||
assert postgresSupport -> postgresql != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgda";
|
||||
version = "5.2.10";
|
||||
|
@ -46,7 +43,6 @@ stdenv.mkDerivation rec {
|
|||
pkg-config
|
||||
intltool
|
||||
itstool
|
||||
libxml2
|
||||
gobject-introspection
|
||||
vala
|
||||
autoreconfHook
|
||||
|
@ -65,6 +61,10 @@ stdenv.mkDerivation rec {
|
|||
postgresql
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libxml2
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-mysql=${if mysqlSupport then "yes" else "no"}"
|
||||
"--with-postgres=${if postgresSupport then "yes" else "no"}"
|
||||
|
|
|
@ -1,10 +1,23 @@
|
|||
{ stdenv, lib, fetchurl, perlPackages, intltool, autoreconfHook,
|
||||
pkg-config, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
|
||||
libimobiledevice,
|
||||
monoSupport ? false, mono, gtk-sharp-2_0
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, perlPackages
|
||||
, intltool
|
||||
, autoreconfHook
|
||||
, pkg-config
|
||||
, glib
|
||||
, libxml2
|
||||
, sqlite
|
||||
, zlib
|
||||
, sg3_utils
|
||||
, gdk-pixbuf
|
||||
, taglib
|
||||
, libimobiledevice
|
||||
, monoSupport ? false
|
||||
, mono
|
||||
, gtk-sharp-2_0
|
||||
}:
|
||||
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgpod";
|
||||
version = "0.8.3";
|
||||
|
@ -27,20 +40,30 @@ stdenv.mkDerivation rec {
|
|||
"--with-udev-dir=${placeholder "out"}/lib/udev"
|
||||
] ++ lib.optionals monoSupport [ "--with-mono" ];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
|
||||
gdk-pixbuf taglib libimobiledevice ];
|
||||
dontStrip = monoSupport;
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook intltool pkg-config ]
|
||||
++ (with perlPackages; [ perl XMLParser ])
|
||||
++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ];
|
||||
++ lib.optional monoSupport mono;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gtkpod.sourceforge.net/";
|
||||
buildInputs = [
|
||||
libxml2
|
||||
sg3_utils
|
||||
sqlite
|
||||
taglib
|
||||
] ++ lib.optional monoSupport gtk-sharp-2_0;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gdk-pixbuf
|
||||
glib
|
||||
libimobiledevice
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://sourceforge.net/projects/gtkpod/";
|
||||
description = "Library used by gtkpod to access the contents of an ipod";
|
||||
license = "LGPL";
|
||||
platforms = lib.platforms.gnu ++ lib.platforms.linux;
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue