From 00f570005752e41a15d34b213a962b0f16bfac1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 14 Dec 2018 19:04:32 -0800 Subject: [PATCH 1/4] playerctl: 0.6.1 -> 2.0.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/playerctl/versions --- pkgs/tools/audio/playerctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 15e7a772bbd1..9d30878daae4 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "playerctl-${version}"; - version = "0.6.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "0jnylj5d6i29c5y6yjxg1a88r2qfbac5pj95f2aljjkfh9428jbb"; + sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb"; }; nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; From 59f8d67ec7bd70d6565ecbcf561b6eabf6cadda3 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 18 Dec 2018 15:01:49 -0500 Subject: [PATCH 2/4] playerctl: enable gtk-doc generation --- pkgs/tools/audio/playerctl/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 9d30878daae4..6bc15cb65d87 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gobject-introspection }: +{ stdenv, meson, ninja, fetchFromGitHub, glib, pkgconfig, gtk-doc, docbook_xsl, gobject-introspection }: stdenv.mkDerivation rec { name = "playerctl-${version}"; @@ -11,13 +11,9 @@ stdenv.mkDerivation rec { sha256 = "0j1fvcc80307ybl1z9l752sr4bcza2fmb8qdivpnm4xmm82faigb"; }; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gtk-doc docbook_xsl gobject-introspection ]; buildInputs = [ glib ]; - # docs somehow crashes the install phase: - # https://github.com/acrisci/playerctl/issues/85 - mesonFlags = [ "-Dgtk-doc=false" ]; - meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; homepage = https://github.com/acrisci/playerctl; From 47cc83dcc81e00e453c9f621098ee0f4a1697ad7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 18 Dec 2018 16:00:00 -0500 Subject: [PATCH 3/4] playerctl: mark as broken on darwin Build fails with: ../playerctl/playerctl-player.c:274:19: error: use of undeclared identifier 'CLOCK_MONOTONIC' clock_gettime(CLOCK_MONOTONIC, &player->priv->cached_position_monotonic); --- pkgs/tools/audio/playerctl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 6bc15cb65d87..d1edbf94fe07 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ puffnfresh ]; + broken = stdenv.hostPlatform.isDarwin; }; } From f9c06d41ddcf1cdd22febb1ad14f9e7db97971bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 20 Dec 2018 10:59:57 +0100 Subject: [PATCH 4/4] yabar-unstable: patch for playerctl-2.0 support --- pkgs/applications/window-managers/yabar/unstable.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 77abc0c7ed4b..47c8f6c5e568 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -1,4 +1,4 @@ -{ playerctl, libxkbcommon, callPackage, attrs ? {} }: +{ fetchpatch, playerctl, libxkbcommon, callPackage, attrs ? {} }: let pkg = callPackage ./build.nix ({ @@ -15,4 +15,11 @@ in pkg.overrideAttrs (o: { makeFlags = o.makeFlags ++ [ "PLAYERCTL=1" ]; + + patches = (o.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/geommer/yabar/commit/008dc1420ff684cf12ce2ef3ac9d642e054e39f5.patch"; + sha256 = "1q7nd66ai6nr2m6iqxn55gvbr4r5gjc00c8wyjc3riv31qcbqbhv"; + }) + ]; })