fix gmusic

This commit is contained in:
Alexander Bantyev 2020-04-30 14:33:26 +03:00
parent e2117a0a80
commit 9bc7130333
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 34 additions and 1 deletions

20
flake.lock generated
View File

@ -185,6 +185,25 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-mopidy": {
"flake": false,
"info": {
"lastModified": 1579858055,
"narHash": "sha256-cbaNod+gStC32dcF15rUSsAWUa5ODXQhv0drnUpUz8I="
},
"locked": {
"owner": "NickHU",
"repo": "nixpkgs",
"rev": "fde5fd4beb6398e59bb639c003c6841dc2fa8579",
"type": "github"
},
"original": {
"owner": "NickHU",
"ref": "mopidy",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-old": { "nixpkgs-old": {
"flake": false, "flake": false,
"info": { "info": {
@ -299,6 +318,7 @@
"nheko": "nheko", "nheko": "nheko",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-mopidy": "nixpkgs-mopidy",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver",

View File

@ -5,6 +5,13 @@
edition = 201909; edition = 201909;
inputs = { inputs = {
nixpkgs-mopidy = {
type = "github";
owner = "NickHU";
repo = "nixpkgs";
ref = "mopidy";
flake = false;
};
NUR = { NUR = {
type = "github"; type = "github";
owner = "nix-community"; owner = "nix-community";

View File

@ -105,6 +105,12 @@ in {
grub2 = super.pkgsi686Linux.grub2; grub2 = super.pkgsi686Linux.grub2;
} else } else
{ })) { }))
(self: super: builtins.mapAttrs (_: v: pkgs.callPackage v.override { }) {
inherit (import inputs.nixpkgs-mopidy {
localSystem.system = "x86_64-linux";
})
mopidy mopidy-gmusic mopidy-mpd mopidy-mpris mopidy-youtube;
})
]; ];
nixpkgs.config = { nixpkgs.config = {
allowUnfree = true; allowUnfree = true;

View File

@ -2,7 +2,7 @@
{ {
services.mopidy = { services.mopidy = {
enable = true; enable = true;
extensionPackages = with pkgs; [ mopidy-mpd mopidy-gmusic mopidy-youtube ]; extensionPackages = with pkgs; [ mopidy-mpd mopidy-gmusic ];
configuration = (if (!isNull config.secrets.gpmusic) then '' configuration = (if (!isNull config.secrets.gpmusic) then ''
[gmusic] [gmusic]
username = ${config.secrets.gpmusic.user} username = ${config.secrets.gpmusic.user}