Merge pull request #112774 from AndersonTorres/updates
treewide: mpd_clientlib -> libmpdclient
This commit is contained in:
commit
d5f20799fa
|
@ -1,11 +1,23 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, intltool,
|
{ lib
|
||||||
wrapGAppsHook, libxml2, curl, mpd_clientlib, dbus-glib,
|
, stdenv
|
||||||
libsoup, avahi, taglib
|
, fetchurl
|
||||||
}:
|
, pkg-config
|
||||||
|
, intltool
|
||||||
|
, avahi
|
||||||
|
, curl
|
||||||
|
, dbus-glib
|
||||||
|
, gettext
|
||||||
|
, gtk3
|
||||||
|
, libmpdclient
|
||||||
|
, libsoup
|
||||||
|
, libxml2
|
||||||
|
, taglib
|
||||||
|
, wrapGAppsHook
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.6";
|
|
||||||
pname = "ario";
|
pname = "ario";
|
||||||
|
version = "1.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
|
url = "mirror://sourceforge/ario-player/${pname}-${version}.tar.gz";
|
||||||
|
@ -14,14 +26,21 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ];
|
nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
gtk3 libxml2 curl mpd_clientlib dbus-glib libsoup avahi taglib
|
avahi
|
||||||
|
curl
|
||||||
|
dbus-glib
|
||||||
|
gtk3
|
||||||
|
libmpdclient
|
||||||
|
libsoup
|
||||||
|
libxml2
|
||||||
|
taglib
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "GTK client for MPD (Music player daemon)";
|
description = "GTK client for MPD (Music player daemon)";
|
||||||
homepage = "http://ario-player.sourceforge.net/";
|
homepage = "http://ario-player.sourceforge.net/";
|
||||||
license = lib.licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = [ lib.maintainers.garrison ];
|
maintainers = [ maintainers.garrison ];
|
||||||
platforms = lib.platforms.all;
|
platforms = platforms.all;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,12 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, meson, ninja }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, libmpdclient
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ashuffle";
|
pname = "ashuffle";
|
||||||
|
@ -14,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
dontUseCmakeConfigure = true;
|
dontUseCmakeConfigure = true;
|
||||||
nativeBuildInputs = [ cmake pkg-config meson ninja ];
|
nativeBuildInputs = [ cmake pkg-config meson ninja ];
|
||||||
buildInputs = [ mpd_clientlib ];
|
buildInputs = [ libmpdclient ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://github.com/joshkunz/ashuffle";
|
homepage = "https://github.com/joshkunz/ashuffle";
|
||||||
|
|
|
@ -1,24 +1,41 @@
|
||||||
{ lib, stdenv, fetchurl, pkg-config, mpd_clientlib, dbus-glib, audacious, gtk2, gsl
|
{ lib
|
||||||
, libaudclient }:
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, pkg-config
|
||||||
|
, dbus-glib
|
||||||
|
, audacious
|
||||||
|
, gtk2
|
||||||
|
, gsl
|
||||||
|
, libaudclient
|
||||||
|
, libmpdclient
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
name = "gjay-0.3.2";
|
pname = "gjay";
|
||||||
|
version = "0.3.2";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz";
|
url = "mirror://sourceforge/project/gjay/${pname}-${version}.tar.gz";
|
||||||
sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
|
sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ mpd_clientlib dbus-glib audacious gtk2 gsl libaudclient ];
|
buildInputs = [
|
||||||
|
libmpdclient
|
||||||
|
dbus-glib
|
||||||
|
audacious
|
||||||
|
gtk2
|
||||||
|
gsl
|
||||||
|
libaudclient
|
||||||
|
];
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
hardeningDisable = [ "format" ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Generates playlists such that each song sounds good following the previous song";
|
description = "Generates playlists such that each song sounds good following the previous song";
|
||||||
homepage = "http://gjay.sourceforge.net/";
|
homepage = "http://gjay.sourceforge.net/";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ pSub ];
|
maintainers = with maintainers; [ pSub ];
|
||||||
platforms = with platforms; linux;
|
platforms = with platforms; linux;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,6 +1,22 @@
|
||||||
{ lib, stdenv, fetchurl, libtool, intltool, pkg-config, glib
|
{ lib
|
||||||
, gtk2, curl, mpd_clientlib, libsoup, gob2, vala, libunique
|
, stdenv
|
||||||
, libSM, libICE, sqlite, hicolor-icon-theme, wrapGAppsHook
|
, fetchurl
|
||||||
|
, libtool
|
||||||
|
, intltool
|
||||||
|
, pkg-config
|
||||||
|
, glib
|
||||||
|
, gtk2
|
||||||
|
, curl
|
||||||
|
, libmpdclient
|
||||||
|
, libsoup
|
||||||
|
, gob2
|
||||||
|
, vala
|
||||||
|
, libunique
|
||||||
|
, libSM
|
||||||
|
, libICE
|
||||||
|
, sqlite
|
||||||
|
, hicolor-icon-theme
|
||||||
|
, wrapGAppsHook
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -26,8 +42,17 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ];
|
nativeBuildInputs = [ pkg-config libtool intltool gob2 vala wrapGAppsHook ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
glib gtk2 curl mpd_clientlib libsoup
|
glib
|
||||||
libunique libmpd libSM libICE sqlite hicolor-icon-theme
|
gtk2
|
||||||
|
curl
|
||||||
|
libmpdclient
|
||||||
|
libsoup
|
||||||
|
libunique
|
||||||
|
libmpd
|
||||||
|
libSM
|
||||||
|
libICE
|
||||||
|
sqlite
|
||||||
|
hicolor-icon-theme
|
||||||
];
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
@ -38,3 +63,4 @@ stdenv.mkDerivation rec {
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
# TODO: what is this libmpd derivation embedded above?
|
||||||
|
|
|
@ -1,4 +1,13 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, mpd_clientlib, sphinx, libiconv }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, libmpdclient
|
||||||
|
, sphinx
|
||||||
|
, libiconv
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mpc";
|
pname = "mpc";
|
||||||
|
@ -11,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx";
|
sha256 = "1qbi0i9cq54rj8z2kapk8x8g1jkw2jz781niwb9i7kw4xfhvy5zx";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ mpd_clientlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
buildInputs = [ libmpdclient ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config sphinx ];
|
nativeBuildInputs = [ meson ninja pkg-config sphinx ];
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
{ lib, stdenv
|
{ lib
|
||||||
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, cmake
|
, cmake
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, mpd_clientlib
|
, libmpdclient
|
||||||
, openssl
|
, openssl
|
||||||
, lua5_3
|
, lua5_3
|
||||||
, libid3tag
|
, libid3tag
|
||||||
|
@ -21,12 +22,9 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ=";
|
sha256 = "sha256-QGJti1tKKJlumLgABPmROplF0UVGMWMnyRXLb2cEieQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [ pkg-config cmake ];
|
||||||
pkg-config
|
|
||||||
cmake
|
|
||||||
];
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
mpd_clientlib
|
libmpdclient
|
||||||
openssl
|
openssl
|
||||||
lua5_3
|
lua5_3
|
||||||
libid3tag
|
libid3tag
|
||||||
|
|
|
@ -1,7 +1,15 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, ncurses
|
{ lib
|
||||||
, mpd_clientlib, gettext, boost
|
, stdenv
|
||||||
, pcreSupport ? false
|
, fetchFromGitHub
|
||||||
, pcre ? null
|
, meson
|
||||||
|
, ninja
|
||||||
|
, pkg-config
|
||||||
|
, glib
|
||||||
|
, ncurses
|
||||||
|
, libmpdclient
|
||||||
|
, gettext
|
||||||
|
, boost
|
||||||
|
, pcreSupport ? false, pcre ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
@ -19,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ=";
|
sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ glib ncurses mpd_clientlib boost ]
|
buildInputs = [ glib ncurses libmpdclient boost ]
|
||||||
++ optional pcreSupport pcre;
|
++ optional pcreSupport pcre;
|
||||||
nativeBuildInputs = [ meson ninja pkg-config gettext ];
|
nativeBuildInputs = [ meson ninja pkg-config gettext ];
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
{ lib, stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkg-config, readline
|
{ lib
|
||||||
, libiconv, icu, curl
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, boost
|
||||||
|
, libmpdclient
|
||||||
|
, ncurses
|
||||||
|
, pkg-config
|
||||||
|
, readline
|
||||||
|
, libiconv
|
||||||
|
, icu
|
||||||
|
, curl
|
||||||
, outputsSupport ? true # outputs screen
|
, outputsSupport ? true # outputs screen
|
||||||
, visualizerSupport ? false, fftw ? null # visualizer screen
|
, visualizerSupport ? false, fftw ? null # visualizer screen
|
||||||
, clockSupport ? true # clock screen
|
, clockSupport ? true # clock screen
|
||||||
|
@ -27,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ boost mpd_clientlib ncurses readline libiconv icu curl ]
|
buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ]
|
||||||
++ optional visualizerSupport fftw
|
++ optional visualizerSupport fftw
|
||||||
++ optional taglibSupport taglib;
|
++ optional taglibSupport taglib;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,14 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, mpd_clientlib, ncurses, pcre, pkg-config
|
{ lib
|
||||||
, taglib, curl }:
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, autoreconfHook
|
||||||
|
, libmpdclient
|
||||||
|
, ncurses
|
||||||
|
, pcre
|
||||||
|
, pkg-config
|
||||||
|
, taglib
|
||||||
|
, curl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.09.2";
|
version = "0.09.2";
|
||||||
|
@ -13,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
buildInputs = [ mpd_clientlib ncurses pcre taglib curl ];
|
buildInputs = [ libmpdclient ncurses pcre taglib curl ];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
mkdir -p $out/etc
|
mkdir -p $out/etc
|
||||||
|
|
|
@ -1,4 +1,11 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, mpd_clientlib, openssl }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, cmake
|
||||||
|
, pkg-config
|
||||||
|
, libmpdclient
|
||||||
|
, openssl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ympd";
|
pname = "ympd";
|
||||||
|
@ -12,13 +19,13 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
nativeBuildInputs = [ cmake pkg-config ];
|
||||||
buildInputs = [ mpd_clientlib openssl ];
|
buildInputs = [ libmpdclient openssl ];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
homepage = "https://www.ympd.org";
|
homepage = "https://www.ympd.org";
|
||||||
description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
|
description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
|
||||||
maintainers = [ lib.maintainers.siddharthist ];
|
maintainers = [ maintainers.siddharthist ];
|
||||||
platforms = lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
license = lib.licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,29 @@
|
||||||
{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config
|
{ cairo
|
||||||
, python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage
|
, cmake
|
||||||
, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper
|
, fetchFromGitHub
|
||||||
|
, libXdmcp
|
||||||
|
, libpthreadstubs
|
||||||
|
, libxcb
|
||||||
|
, pcre
|
||||||
|
, pkg-config
|
||||||
|
, python3
|
||||||
|
, lib
|
||||||
|
, stdenv
|
||||||
|
, xcbproto
|
||||||
|
, xcbutil
|
||||||
|
, xcbutilcursor
|
||||||
|
, xcbutilimage
|
||||||
|
, xcbutilrenderutil
|
||||||
|
, xcbutilwm
|
||||||
|
, xcbutilxrm
|
||||||
|
, makeWrapper
|
||||||
, removeReferencesTo
|
, removeReferencesTo
|
||||||
|
|
||||||
# optional packages-- override the variables ending in 'Support' to enable or
|
# optional packages-- override the variables ending in 'Support' to enable or
|
||||||
# disable modules
|
# disable modules
|
||||||
, alsaSupport ? true, alsaLib ? null
|
, alsaSupport ? true, alsaLib ? null
|
||||||
, githubSupport ? false, curl ? null
|
, githubSupport ? false, curl ? null
|
||||||
, mpdSupport ? false, mpd_clientlib ? null
|
, mpdSupport ? false, libmpdclient ? null
|
||||||
, pulseSupport ? false, libpulseaudio ? null
|
, pulseSupport ? false, libpulseaudio ? null
|
||||||
, iwSupport ? false, wirelesstools ? null
|
, iwSupport ? false, wirelesstools ? null
|
||||||
, nlSupport ? true, libnl ? null
|
, nlSupport ? true, libnl ? null
|
||||||
|
@ -16,7 +32,7 @@
|
||||||
|
|
||||||
assert alsaSupport -> alsaLib != null;
|
assert alsaSupport -> alsaLib != null;
|
||||||
assert githubSupport -> curl != null;
|
assert githubSupport -> curl != null;
|
||||||
assert mpdSupport -> mpd_clientlib != null;
|
assert mpdSupport -> libmpdclient != null;
|
||||||
assert pulseSupport -> libpulseaudio != null;
|
assert pulseSupport -> libpulseaudio != null;
|
||||||
|
|
||||||
assert iwSupport -> ! nlSupport && wirelesstools != null;
|
assert iwSupport -> ! nlSupport && wirelesstools != null;
|
||||||
|
@ -37,26 +53,24 @@ stdenv.mkDerivation rec {
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
homepage = "https://polybar.github.io/";
|
|
||||||
description = "A fast and easy-to-use tool for creating status bars";
|
|
||||||
longDescription = ''
|
|
||||||
Polybar aims to help users build beautiful and highly customizable
|
|
||||||
status bars for their desktop environment, without the need of
|
|
||||||
having a black belt in shell scripting.
|
|
||||||
'';
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ afldcr Br1ght0ne ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cairo libXdmcp libpthreadstubs libxcb pcre python3 xcbproto xcbutil
|
cairo
|
||||||
xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
|
libXdmcp
|
||||||
|
libpthreadstubs
|
||||||
|
libxcb
|
||||||
|
pcre
|
||||||
|
python3
|
||||||
|
xcbproto
|
||||||
|
xcbutil
|
||||||
|
xcbutilcursor
|
||||||
|
xcbutilimage
|
||||||
|
xcbutilrenderutil
|
||||||
|
xcbutilwm
|
||||||
|
xcbutilxrm
|
||||||
|
|
||||||
(if alsaSupport then alsaLib else null)
|
(if alsaSupport then alsaLib else null)
|
||||||
(if githubSupport then curl else null)
|
(if githubSupport then curl else null)
|
||||||
(if mpdSupport then mpd_clientlib else null)
|
(if mpdSupport then libmpdclient else null)
|
||||||
(if pulseSupport then libpulseaudio else null)
|
(if pulseSupport then libpulseaudio else null)
|
||||||
|
|
||||||
(if iwSupport then wirelesstools else null)
|
(if iwSupport then wirelesstools else null)
|
||||||
|
@ -69,16 +83,36 @@ stdenv.mkDerivation rec {
|
||||||
(if i3Support || i3GapsSupport then makeWrapper else null)
|
(if i3Support || i3GapsSupport then makeWrapper else null)
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = if (i3Support || i3GapsSupport) then ''
|
postInstall = if i3Support
|
||||||
wrapProgram $out/bin/polybar \
|
then ''wrapProgram $out/bin/polybar \
|
||||||
--prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
|
--prefix PATH : "${i3}/bin"
|
||||||
'' else "";
|
''
|
||||||
|
else if i3GapsSupport
|
||||||
|
then ''wrapProgram $out/bin/polybar \
|
||||||
|
--prefix PATH : "${i3-gaps}/bin"
|
||||||
|
''
|
||||||
|
else '''';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake pkg-config removeReferencesTo
|
cmake
|
||||||
|
pkg-config
|
||||||
|
removeReferencesTo
|
||||||
];
|
];
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
remove-references-to -t ${stdenv.cc} $out/bin/polybar
|
remove-references-to -t ${stdenv.cc} $out/bin/polybar
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://polybar.github.io/";
|
||||||
|
description = "A fast and easy-to-use tool for creating status bars";
|
||||||
|
longDescription = ''
|
||||||
|
Polybar aims to help users build beautiful and highly customizable
|
||||||
|
status bars for their desktop environment, without the need of
|
||||||
|
having a black belt in shell scripting.
|
||||||
|
'';
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ afldcr Br1ght0ne ];
|
||||||
|
platforms = platforms.linux;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,19 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook
|
{ lib
|
||||||
, wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, meson
|
||||||
|
, pkg-config
|
||||||
|
, ninja
|
||||||
|
, wrapGAppsHook
|
||||||
|
, wayland
|
||||||
|
, wlroots
|
||||||
|
, gtkmm3
|
||||||
|
, libsigcxx
|
||||||
|
, jsoncpp
|
||||||
|
, fmt
|
||||||
|
, scdoc
|
||||||
|
, spdlog
|
||||||
|
, gtk-layer-shell
|
||||||
, howard-hinnant-date, cmake
|
, howard-hinnant-date, cmake
|
||||||
, traySupport ? true, libdbusmenu-gtk3
|
, traySupport ? true, libdbusmenu-gtk3
|
||||||
, pulseSupport ? true, libpulseaudio
|
, pulseSupport ? true, libpulseaudio
|
||||||
|
@ -7,68 +21,69 @@
|
||||||
, nlSupport ? true, libnl
|
, nlSupport ? true, libnl
|
||||||
, udevSupport ? true, udev
|
, udevSupport ? true, udev
|
||||||
, swaySupport ? true, sway
|
, swaySupport ? true, sway
|
||||||
, mpdSupport ? true, mpd_clientlib
|
, mpdSupport ? true, libmpdclient
|
||||||
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
|
, withMediaPlayer ? false, glib, gobject-introspection, python3, python38Packages, playerctl
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "waybar";
|
|
||||||
version = "0.9.5";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
stdenv.mkDerivation rec {
|
||||||
owner = "Alexays";
|
pname = "waybar";
|
||||||
repo = "Waybar";
|
version = "0.9.5";
|
||||||
rev = version;
|
|
||||||
sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
src = fetchFromGitHub {
|
||||||
meson ninja pkg-config scdoc wrapGAppsHook cmake
|
owner = "Alexays";
|
||||||
] ++ lib.optional withMediaPlayer gobject-introspection;
|
repo = "Waybar";
|
||||||
|
rev = version;
|
||||||
|
sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q";
|
||||||
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = lib.optionals withMediaPlayer [
|
nativeBuildInputs = [
|
||||||
glib
|
meson ninja pkg-config scdoc wrapGAppsHook cmake
|
||||||
playerctl
|
] ++ lib.optional withMediaPlayer gobject-introspection;
|
||||||
python38Packages.pygobject3
|
|
||||||
];
|
|
||||||
strictDeps = false;
|
|
||||||
|
|
||||||
buildInputs = with lib;
|
propagatedBuildInputs = lib.optionals withMediaPlayer [
|
||||||
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
|
glib
|
||||||
++ optional traySupport libdbusmenu-gtk3
|
playerctl
|
||||||
++ optional pulseSupport libpulseaudio
|
python38Packages.pygobject3
|
||||||
++ optional sndioSupport sndio
|
];
|
||||||
++ optional nlSupport libnl
|
strictDeps = false;
|
||||||
++ optional udevSupport udev
|
|
||||||
++ optional swaySupport sway
|
|
||||||
++ optional mpdSupport mpd_clientlib;
|
|
||||||
|
|
||||||
mesonFlags = (lib.mapAttrsToList
|
buildInputs = with lib;
|
||||||
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
|
[ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ]
|
||||||
{
|
++ optional traySupport libdbusmenu-gtk3
|
||||||
dbusmenu-gtk = traySupport;
|
++ optional pulseSupport libpulseaudio
|
||||||
pulseaudio = pulseSupport;
|
++ optional sndioSupport sndio
|
||||||
sndio = sndioSupport;
|
++ optional nlSupport libnl
|
||||||
libnl = nlSupport;
|
++ optional udevSupport udev
|
||||||
libudev = udevSupport;
|
++ optional swaySupport sway
|
||||||
mpd = mpdSupport;
|
++ optional mpdSupport libmpdclient;
|
||||||
}
|
|
||||||
) ++ [
|
|
||||||
"-Dout=${placeholder "out"}"
|
|
||||||
"-Dsystemd=disabled"
|
|
||||||
];
|
|
||||||
|
|
||||||
preFixup = lib.optional withMediaPlayer ''
|
mesonFlags = (lib.mapAttrsToList
|
||||||
|
(option: enable: "-D${option}=${if enable then "enabled" else "disabled"}")
|
||||||
|
{
|
||||||
|
dbusmenu-gtk = traySupport;
|
||||||
|
pulseaudio = pulseSupport;
|
||||||
|
sndio = sndioSupport;
|
||||||
|
libnl = nlSupport;
|
||||||
|
libudev = udevSupport;
|
||||||
|
mpd = mpdSupport;
|
||||||
|
}
|
||||||
|
) ++ [
|
||||||
|
"-Dout=${placeholder "out"}"
|
||||||
|
"-Dsystemd=disabled"
|
||||||
|
];
|
||||||
|
|
||||||
|
preFixup = lib.optional withMediaPlayer ''
|
||||||
cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
|
cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
|
||||||
|
|
||||||
wrapProgram $out/bin/waybar-mediaplayer.py \
|
wrapProgram $out/bin/waybar-mediaplayer.py \
|
||||||
--prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
|
--prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
|
description = "Highly customizable Wayland bar for Sway and Wlroots based compositors";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
|
maintainers = with maintainers; [ FlorianFranzen minijackson synthetica ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
homepage = "https://github.com/alexays/waybar";
|
homepage = "https://github.com/alexays/waybar";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
# Services
|
# Services
|
||||||
, yajl
|
, yajl
|
||||||
# Client support
|
# Client support
|
||||||
, mpd_clientlib
|
, libmpdclient
|
||||||
# Tag support
|
# Tag support
|
||||||
, libid3tag
|
, libid3tag
|
||||||
, nixosTests
|
, nixosTests
|
||||||
|
@ -70,7 +70,7 @@ let
|
||||||
soundcloud = [ curl yajl ];
|
soundcloud = [ curl yajl ];
|
||||||
tidal = [ curl yajl ];
|
tidal = [ curl yajl ];
|
||||||
# Client support
|
# Client support
|
||||||
libmpdclient = [ mpd_clientlib ];
|
libmpdclient = [ libmpdclient ];
|
||||||
# Tag support
|
# Tag support
|
||||||
id3tag = [ libid3tag ];
|
id3tag = [ libid3tag ];
|
||||||
# Misc
|
# Misc
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, pkg-config, mpd_clientlib, curl }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pkg-config
|
||||||
|
, libmpdclient
|
||||||
|
, curl
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mpdas";
|
pname = "mpdas";
|
||||||
|
@ -13,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
buildInputs = [ mpd_clientlib curl ];
|
buildInputs = [ libmpdclient curl ];
|
||||||
|
|
||||||
makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ];
|
makeFlags = [ "CONFIG=/etc" "DESTDIR=" "PREFIX=$(out)" ];
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,19 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib, libdaemon
|
{ lib
|
||||||
, mpd_clientlib, curl, sqlite, bundlerEnv, libnotify, pandoc }:
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, autoconf
|
||||||
|
, automake
|
||||||
|
, libtool
|
||||||
|
, pkg-config
|
||||||
|
, glib
|
||||||
|
, libdaemon
|
||||||
|
, libmpdclient
|
||||||
|
, curl
|
||||||
|
, sqlite
|
||||||
|
, bundlerEnv
|
||||||
|
, libnotify
|
||||||
|
, pandoc
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
gemEnv = bundlerEnv {
|
gemEnv = bundlerEnv {
|
||||||
|
@ -7,8 +21,8 @@ let
|
||||||
gemdir = ./.;
|
gemdir = ./.;
|
||||||
};
|
};
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
version = "20161228";
|
|
||||||
pname = "mpdcron";
|
pname = "mpdcron";
|
||||||
|
version = "20161228";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "alip";
|
owner = "alip";
|
||||||
|
@ -17,21 +31,33 @@ in stdenv.mkDerivation {
|
||||||
sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw";
|
sha256 = "0vdksf6lcgmizqr5mqp0bbci259k0dj7gpmhx32md41jlmw5skaw";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
buildInputs = [
|
||||||
description = "A cron like daemon for mpd";
|
autoconf
|
||||||
homepage = "http://alip.github.io/mpdcron/";
|
automake
|
||||||
license = licenses.gpl2;
|
libtool
|
||||||
platforms = platforms.unix;
|
pkg-config
|
||||||
maintainers = with maintainers; [ lovek323 manveru ];
|
glib
|
||||||
};
|
libdaemon
|
||||||
|
pandoc
|
||||||
buildInputs =
|
libmpdclient
|
||||||
[ autoconf automake libtool pkg-config glib libdaemon pandoc
|
curl
|
||||||
mpd_clientlib curl sqlite gemEnv.wrappedRuby libnotify ];
|
sqlite
|
||||||
|
gemEnv.wrappedRuby
|
||||||
|
libnotify
|
||||||
|
];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
|
configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "A cron like daemon for mpd";
|
||||||
|
homepage = "http://alip.github.io/mpdcron/";
|
||||||
|
license = licenses.gpl2Plus;
|
||||||
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ lovek323 manveru ];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
# TODO: autoreconfHook this
|
||||||
|
|
|
@ -1,22 +1,38 @@
|
||||||
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchurl
|
||||||
|
, pkg-config
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, boost
|
||||||
|
, curl
|
||||||
|
, libgcrypt
|
||||||
|
, libmpdclient
|
||||||
|
, systemd
|
||||||
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "mpdscribble";
|
pname = "mpdscribble";
|
||||||
version = "0.23";
|
version = "0.23";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url =
|
url = "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz";
|
||||||
"https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz";
|
|
||||||
sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53";
|
sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ meson ninja pkg-config ];
|
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||||
buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ];
|
buildInputs = [
|
||||||
|
libmpdclient
|
||||||
|
curl
|
||||||
|
boost
|
||||||
|
libgcrypt
|
||||||
|
systemd
|
||||||
|
];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)";
|
description = "A MPD client which submits info about tracks being played to a scrobbler";
|
||||||
homepage = "https://www.musicpd.org/clients/mpdscribble/";
|
homepage = "https://www.musicpd.org/clients/mpdscribble/";
|
||||||
license = licenses.gpl2;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = [ maintainers.sohalt ];
|
maintainers = [ maintainers.sohalt ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
|
|
|
@ -389,6 +389,7 @@ mapAliases ({
|
||||||
mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream.";
|
mono-zeroconf = throw "mono-zeroconf was deprecated on 2019-09-20: abandoned by upstream.";
|
||||||
mozart = mozart2-binary; # added 2019-09-23
|
mozart = mozart2-binary; # added 2019-09-23
|
||||||
mozart-binary = mozart2-binary; # added 2019-09-23
|
mozart-binary = mozart2-binary; # added 2019-09-23
|
||||||
|
mpd_clientlib = libmpdclient; # added 2021-02-11
|
||||||
mpich2 = mpich; # added 2018-08-06
|
mpich2 = mpich; # added 2018-08-06
|
||||||
msf = metasploit; # added 2018-04-25
|
msf = metasploit; # added 2018-04-25
|
||||||
libmsgpack = msgpack; # added 2018-08-17
|
libmsgpack = msgpack; # added 2018-08-17
|
||||||
|
|
|
@ -17929,7 +17929,6 @@ in
|
||||||
inherit (callPackages ../servers/mpd { })
|
inherit (callPackages ../servers/mpd { })
|
||||||
mpd mpd-small mpdWithFeatures;
|
mpd mpd-small mpdWithFeatures;
|
||||||
|
|
||||||
mpd_clientlib = libmpdclient;
|
|
||||||
libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };
|
libmpdclient = callPackage ../servers/mpd/libmpdclient.nix { };
|
||||||
|
|
||||||
mpdscribble = callPackage ../tools/misc/mpdscribble { };
|
mpdscribble = callPackage ../tools/misc/mpdscribble { };
|
||||||
|
|
Loading…
Reference in a new issue