Update to git mpris

Cargo.lock

@@ -436,8 +436,7 @@ dependencies = [
 [[package]]
 name = "mpris"
 version = "2.0.0-rc2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "195e67e2b467af5146f517b0d988b5894e425a77c52a9bb5a065513ef3c2e711"
+source = "git+https://github.com/Mange/mpris-rs#c3f47a33d2e816bedaabb6dd1019b884c1681522"
 dependencies = [
  "dbus 0.8.4",
  "derive_is_enum_variant",

flake.lock

@@ -3,36 +3,20 @@
     "crate2nix": {
       "flake": false,
       "locked": {
-        "lastModified": 1600704184,
-        "narHash": "sha256-PaLz9kGAfmumbftRBqbDlUVOxXey1Mt/LS3Tov//1PU=",
+        "lastModified": 1603629926,
+        "narHash": "sha256-mQg9HzU0tRCKgk8GFhQ2QrxyCUjGgsJqH5JA4SZDyc4=",
         "owner": "balsoft",
         "repo": "crate2nix",
-        "rev": "f26503fece52ce143e207dceff337c83ff4c2f65",
+        "rev": "9b7b8ea918e3b28538868f8aeb8318f02bb75cb9",
         "type": "github"
       },
       "original": {
         "owner": "balsoft",
-        "ref": "balsoft/callcrate",
+        "ref": "balsoft/fix-tools-nix",
         "repo": "crate2nix",
         "type": "github"
       }
     },
-    "crates-io-index": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1603572719,
-        "narHash": "sha256-58j3Y9P4Rsa2rrY/tc7DqXQeI93NPzDedDq4RChkGMY=",
-        "owner": "rust-lang",
-        "repo": "crates.io-index",
-        "rev": "e7aefc38a0eb2633731c0f78d493f2c040ec3011",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "repo": "crates.io-index",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1599773960,
@@ -51,7 +35,6 @@
     "root": {
       "inputs": {
         "crate2nix": "crate2nix",
-        "crates-io-index": "crates-io-index",
         "nixpkgs": "nixpkgs"
       }
     }

flake.nix

@@ -8,28 +8,27 @@
       type = "github";
       owner = "balsoft";
       repo = "crate2nix";
-      ref = "balsoft/callcrate";
-      flake = false;
-    };
-    crates-io-index = {
-      url = "github:rust-lang/crates.io-index";
+      ref = "balsoft/fix-tools-nix";
       flake = false;
     };
   };
 
   description = "A collection of simple on-screen-display daemons";
 
-  outputs = { self, nixpkgs, crate2nix, crates-io-index }:
+  outputs = { self, nixpkgs, crate2nix }:
     let forAllSystems = f: builtins.mapAttrs (_: f) nixpkgs.legacyPackages;
     in {
       packages = forAllSystems (pkgs:
         let
           commonDeps = with pkgs; [ libnotify gdk_pixbuf glib ];
 
-          inherit (import crate2nix { inherit pkgs crates-io-index; })
-            callCrate;
+          inherit (import "${crate2nix}/tools.nix" { inherit pkgs; })
+            generatedCargoNix;
 
-          project = callCrate ./. {
+          project = pkgs.callPackage (generatedCargoNix {
+            name = "simple-osd-daemons";
+            src = ./.;
+          }) {
             defaultCrateOverrides = pkgs.defaultCrateOverrides // {
               simple-osd-battery = oa: { buildInputs = commonDeps; };
               simple-osd-bluetooth = oa: {

mpris/Cargo.toml

@@ -12,5 +12,5 @@ display_on_volume_changes = ["libpulse-binding"]
 
 [dependencies]
 simple-osd-common = { version = "0.1", path = "../common" }
-mpris = "2.0.0-rc2"
+mpris = { git = "https://github.com/Mange/mpris-rs" }
 libpulse-binding = { version = "2.16.2", optional = true }