From 0756450ca085a272fe683705acdf48ea8b842ec3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 1 Jun 2024 22:56:02 +0300 Subject: [PATCH 1/3] libmpd: init at 11.8.17 --- pkgs/by-name/li/libmpd/package.nix | 45 ++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/li/libmpd/package.nix diff --git a/pkgs/by-name/li/libmpd/package.nix b/pkgs/by-name/li/libmpd/package.nix new file mode 100644 index 000000000000..f5f8660865f2 --- /dev/null +++ b/pkgs/by-name/li/libmpd/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +, pkg-config +, doxygen +, glib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libmpd"; + version = "11.8.17"; + outputs = [ + "out" + "dev" + "devdoc" + ]; + + src = fetchurl { + url = "https://www.musicpd.org/download/libmpd/${finalAttrs.version}/libmpd-${finalAttrs.version}.tar.gz"; + hash = "sha256-/iAyaw0QZB9xxGc/rmN7+SIqluFxL3HxcPyi/DS/eoM="; + }; + + nativeBuildInputs = [ + pkg-config + doxygen + ]; + buildInputs = [ + glib + ]; + + postInstall = '' + make doc + mkdir -p $devdoc/share/devhelp/libmpd + cp -r doc/html $devdoc/share/devhelp/libmpd/doxygen + ''; + + meta = with lib; { + description = "Higher level access to MPD functions"; + homepage = "https://www.musicpd.org/download/libmpd/"; + changelog = "https://www.musicpd.org/download/libmpd/${finalAttrs.version}/README"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +}) From 616827fd9a24c53627b3871a2e4c1531ca121982 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 1 Jun 2024 23:29:09 +0300 Subject: [PATCH 2/3] xfce.xfmpc: init at 0.3.1-2024-05-29 --- .../xfce/applications/xfmpc/default.nix | 39 +++++++++++++++++++ pkgs/desktops/xfce/default.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/desktops/xfce/applications/xfmpc/default.nix diff --git a/pkgs/desktops/xfce/applications/xfmpc/default.nix b/pkgs/desktops/xfce/applications/xfmpc/default.nix new file mode 100644 index 000000000000..a8322c7e51bf --- /dev/null +++ b/pkgs/desktops/xfce/applications/xfmpc/default.nix @@ -0,0 +1,39 @@ +{ lib +, mkXfceDerivation +, vala +, libxfce4util +, libxfce4ui +, gtk3 +, glib +, libmpd +}: + +mkXfceDerivation rec { + category = "apps"; + pname = "xfmpc"; + # Last release is too old + version = "0.3.1-2024-05-29"; + rev = "cf40dffec6e9b80abb1f1aa6d7dceef4790173dc"; + sha256 = "sha256-moCWSLGBJuWM4/lRJi6D3w38iJeCntLo3Vl/eVfu7lw="; + + nativeBuildInputs = [ + vala + libxfce4util + # Needed both here and in buildInputs for cross compilation to work + libxfce4ui + ]; + buildInputs = [ + gtk3 + glib + libxfce4ui + libmpd + ]; + + meta = with lib; { + description = "MPD client written in GTK"; + homepage = "https://docs.xfce.org/apps/xfmpc/start"; + changelog = "https://gitlab.xfce.org/apps/xfmpc/-/blob/${rev}/NEWS"; + maintainers = with maintainers; [ doronbehar ] ++ teams.xfce.members; + mainProgram = "xfmpc"; + }; +} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 77d783cd9039..5309773a6872 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -80,6 +80,8 @@ makeScopeWithSplicing' { ristretto = callPackage ./applications/ristretto { }; + xfmpc = callPackage ./applications/xfmpc { }; + xfce4-taskmanager = callPackage ./applications/xfce4-taskmanager { }; xfce4-dict = callPackage ./applications/xfce4-dict { }; From 22b7dfe0a268d84239f55a79611287a9397c39b6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 2 Jun 2024 20:13:38 +0300 Subject: [PATCH 3/3] libmpd: mark as broken on Darwin --- pkgs/by-name/li/libmpd/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/li/libmpd/package.nix b/pkgs/by-name/li/libmpd/package.nix index f5f8660865f2..bf2e6c70d2ad 100644 --- a/pkgs/by-name/li/libmpd/package.nix +++ b/pkgs/by-name/li/libmpd/package.nix @@ -41,5 +41,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; + # Getting DARWIN_NULL related errors + broken = stdenv.isDarwin; }; })