public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75555 from worldofpeace/libgpod-python2-byehun

Browse Source 
libgpod: drop pygobject2
This commit is contained in:
worldofpeace 2019-12-17 01:47:24 -05:00 committed by GitHub
commit 6ea98c1329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/gpodder/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, python3Packages, intltool { stdenv, fetchFromGitHub, python3, python3Packages, intltool
, glibcLocales, gnome3, gtk3, wrapGAppsHook , glibcLocales, gnome3, gtk3, wrapGAppsHook
, ipodSupport ? false, libgpod, gobject-introspection , gobject-introspection
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec {
podcastparser podcastparser
html5lib html5lib
gtk3 gtk3
] ++ stdenv.lib.optional ipodSupport libgpod; ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"

14
pkgs/development/libraries/libgpod/default.nix
View File

@ -1,18 +1,20 @@
{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, { stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
libimobiledevice, python3Packages, mutagen, libimobiledevice, mutagen,
monoSupport ? false, mono, gtk-sharp-2_0 monoSupport ? false, mono, gtk-sharp-2_0
}: }:
let
inherit (python3Packages) python pygobject2; stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
name = "libgpod-0.8.3"; name = "libgpod-0.8.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/gtkpod/${name}.tar.bz2"; url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3"; sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
}; };
outputs = [ "out" "dev" ];
preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )"; preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";
configureFlags = [ configureFlags = [
@ -23,7 +25,7 @@ in stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
gdk-pixbuf taglib libimobiledevice python pygobject2 mutagen ]; gdk-pixbuf taglib libimobiledevice mutagen ];
nativeBuildInputs = [ gettext intltool pkgconfig ] nativeBuildInputs = [ gettext intltool pkgconfig ]
++ (with perlPackages; [ perl XMLParser ]) ++ (with perlPackages; [ perl XMLParser ])