Make custom-desktop-entries separate derivations

Instead of joining all desktop entries into one derivation (from a list
of derivations), expose the entries in an attrset.

This allows users to use select entries instead of being forced to use
all.

Author: bjornfor

cfg/base-medium.nix

@@ -60,7 +60,12 @@
     mtr
     mutt
     my.nix-check-before-push
-    my.custom-desktop-entries
+    my.custom-desktop-entries.gmail
+    my.custom-desktop-entries.netflix
+    my.custom-desktop-entries.sbanken
+    my.custom-desktop-entries.tv-get-no
+    my.custom-desktop-entries.tv-nrk-no
+    my.custom-desktop-entries.youtube
     ncdu
     nethogs
     networkmanager

pkgs/custom-desktop-entries/default.nix

@@ -1,4 +1,4 @@
-{ lib, fetchurl, runCommand, pkgs }:
+{ lib, fetchurl, makeDesktopItem, pkgs }:
 
 # StartupWMClass is found with `xprop WM_CLASS`. When multiple entries are
 # returned, use the first one (most specific). (Ideally, all values could be
@@ -9,9 +9,9 @@ let
 
   makeSimpleWebApp = localLib.makeSimpleWebApp;
 
-  entries = [
+  entries = {
 
-    (makeSimpleWebApp {
+    tv-get-no = makeSimpleWebApp {
       server = "tv.get.no";
       # Chromium fails with
       #   This video file cannot be played.
@@ -24,18 +24,18 @@ let
         sha256 = "0acrlix5qmnb32zaqcch0khb6s7ajrw4qv5ikx33bpf71mimkc94";
       };
       comment = "Get Nett-TV";
-    })
+    };
 
-    (makeSimpleWebApp {
+    gmail = makeSimpleWebApp {
       server = "mail.google.com";
       icon = fetchurl {
         url = "https://upload.wikimedia.org/wikipedia/commons/a/ab/Gmail_Icon.svg";
         sha256 = "1avrc2laqmviih3gx4pkxrd7v2hkcgp48c7zcb1wmxbnxvcqxgqr";
       };
       comment = "GMail";
-    })
+    };
 
-    (makeSimpleWebApp {
+    netflix = makeSimpleWebApp {
       server = "www.netflix.com";
       # It's a pain to maintain widewine for Chromium (slow to build, breaks), so
       # use google-chrome for netflix.
@@ -45,19 +45,19 @@ let
         sha256 = "06n3crmfc3k8yahybic399p832vzj5afrdqvlizrk8lbk3plrjd2";
       };
       comment = "Netflix";
-    })
+    };
 
-    (makeSimpleWebApp {
+    tv-nrk-no = makeSimpleWebApp {
       server = "tv.nrk.no";
       icon = fetchurl {
         name = "nrk-tv-logo.png";
         url = "http://mirrors.kodi.tv/addons/leia/plugin.video.nrk/icon.png";
         sha256 = "0a0cn831qcn1wn2zqrgjhw3q3ch9li7fqgazvcii4a8gcrvcc3sm";
       };
       comment = "NRK TV";
-    })
+    };
 
-    (makeSimpleWebApp {
+    sbanken = makeSimpleWebApp {
       server = "sbanken.no";
       # icon from google play
       # (https://play.google.com/store/apps/details?id=no.skandiabanken)
@@ -67,24 +67,18 @@ let
         sha256 = "1n4mjyhjn3npc785bvb3r0cpwndrzdzq8qq60d93hbgh9y04mdda";
       };
       comment = "Sbanken";
-    })
+    };
 
-    (makeSimpleWebApp {
+    youtube = makeSimpleWebApp {
       server = "www.youtube.com";
       icon = fetchurl {
         url = "https://upload.wikimedia.org/wikipedia/commons/4/40/Youtube_icon.svg";
         sha256 = "0gqnp61pbcsfd34w6r9bjxnpzkrlb0nhwb8z3h2a4xbyawa9dpcq";
       };
       comment = "YouTube";
-    })
+    };
 
-  ];
-
-  mkCommand = drv: ''
-    cp -r "${drv}/"* "$out"; chmod -R +w "$out"
-  '';
+  };
 
 in
-  runCommand "custom-desktop-entries" {} (''
-    mkdir -p "$out"
-  '' + (lib.concatMapStringsSep "\n" mkCommand entries))
+  entries