From db091af22841c0b686fd450810102829e808a2d4 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 27 Nov 2019 14:28:24 -0700 Subject: [PATCH] mpdris2: use python3 for #74295 Also use fetchFromGitHub for hash stability. Co-authored-by: worldofpeace --- pkgs/tools/audio/mpdris2/default.nix | 48 +++++++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index d13dfbe8f43d91..0dbdcd7d25a38a 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -1,31 +1,55 @@ -{ stdenv, fetchurl, autoreconfHook, intltool -, pythonPackages +{ stdenv +, autoreconfHook +, fetchFromGitHub +, glib +, gobject-introspection +, intltool +, libnotify +, python3 +, wrapGAppsHook }: -stdenv.mkDerivation rec { +python3.pkgs.buildPythonApplication rec { pname = "mpDris2"; version = "0.8"; + format = "other"; + strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943 - src = fetchurl { - url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz"; - sha256 = "14a3va3929qaq1sp9hs9w4bs6lykdvshkbc58kbsc5nzvlgmrcdn"; + src = fetchFromGitHub { + owner = "eonpatapon"; + repo = pname; + rev = version; + sha256 = "048b8acsd1b8kcxzd9fsh5p9g2an9c4rznicfcpyrsjz5syv894h"; }; preConfigure = '' intltoolize -f ''; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ intltool pythonPackages.wrapPython ]; - propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ]; - pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify mutagen ]; - postInstall = "wrapPythonPrograms"; + nativeBuildInputs = [ + autoreconfHook + gobject-introspection + intltool + wrapGAppsHook + ]; + + buildInputs = [ + glib + libnotify + ]; + + propagatedBuildInputs = with python3.pkgs; [ + dbus-python + mpd2 + mutagen + pygobject3 + ]; meta = with stdenv.lib; { description = "MPRIS 2 support for mpd"; homepage = https://github.com/eonpatapon/mpDris2/; license = licenses.gpl3; + maintainers = with maintainers; []; platforms = platforms.unix; - maintainers = with maintainers; [ pjones ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3675ac57736db0..dccc7404c6fbb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6650,7 +6650,7 @@ in thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; tiled = libsForQt5.callPackage ../applications/editors/tiled { }; - + tiledb = callPackage ../development/libraries/tiledb { }; timemachine = callPackage ../applications/audio/timemachine { };