git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75555 from worldofpeace/libgpod-python2-byehun

libgpod: drop pygobject2

commit6ea98c1329b3736101dbc9bc1e656a7b7cd3819d authorworldofpeace <worldofpeace@protonmail.ch> dateTue 17 Dec 2019, 01:47 (7 years ago) parent77d0815d206f31
2 files changed+10−8
pkgs/applications/audio/gpodder/default.nix+2−2 pkgs/development/libraries/libgpod/default.nix+8−6
pkgs/applications/audio/gpodder/default.nix+2−2
@@ -1,6 +1,6 @@
11{ stdenv, fetchFromGitHub, python3, python3Packages, intltool
22, glibcLocales, gnome3, gtk3, wrapGAppsHook
3−, ipodSupport ? false, libgpod, gobject-introspection
3+, gobject-introspection
44}:
55
66python3Packages.buildPythonApplication rec {
@@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec {
5050 podcastparser
5151 html5lib
5252 gtk3
53− ] ++ stdenv.lib.optional ipodSupport libgpod;
53+ ];
5454
5555 makeFlags = [
5656 "PREFIX=$(out)"
pkgs/development/libraries/libgpod/default.nix+8−6
@@ -1,18 +1,20 @@
1−{stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
1+{ stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
22 libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
3− libimobiledevice, python3Packages, mutagen,
3+ libimobiledevice, mutagen,
44 monoSupport ? false, mono, gtk-sharp-2_0
55}:
66
7−let
8− inherit (python3Packages) python pygobject2;
9−in stdenv.mkDerivation rec {
7+
8+stdenv.mkDerivation rec {
109 name = "libgpod-0.8.3";
10+
1111 src = fetchurl {
1212 url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
1313 sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
1414 };
1515
16+ outputs = [ "out" "dev" ];
17+
1618 preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";
1719
1820 configureFlags = [
@@ -23,7 +25,7 @@ in stdenv.mkDerivation rec {
2325 dontStrip = true;
2426
2527 propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
26− gdk-pixbuf taglib libimobiledevice python pygobject2 mutagen ];
28+ gdk-pixbuf taglib libimobiledevice mutagen ];
2729
2830 nativeBuildInputs = [ gettext intltool pkgconfig ]
2931 ++ (with perlPackages; [ perl XMLParser ])