Merge branch 'master' into staging-next

Hydra: ?compare=1473892

pkgs/tools/system/cron/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   hardeningEnable = [ "pie" ];
 
   preBuild = ''
-    # do not set sticky bit in /nix/store 
+    # do not set sticky bit in /nix/store
     substituteInPlace Makefile --replace ' -o root' ' ' --replace 111 755 --replace 4755 0755
     # do not strip during install, broken on cross and we'll do ourselves as needed
     substituteInPlace Makefile --replace ' -s cron' ' cron'
@@ -36,8 +36,9 @@ stdenv.mkDerivation {
 
   preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Daemon for running commands at specific times (Vixie Cron)";
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    license = licenses.bsd0;
+    platforms = with platforms; linux ++ darwin;
   };
 }

pkgs/tools/system/rofi-systemd/default.nix

@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "rofi-systemd-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "IvanMalison";
+    repo = "rofi-systemd";
+    rev = "v${version}";
+    sha256 = "1dbygq3qaj1f73hh3njdnmibq7vi6zbyzdc6c0j989c0r1ksv0zi";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a rofi-systemd $out/bin/rofi-systemd
+  '';
+
+  wrapperPath = with stdenv.lib; makeBinPath [
+    rofi
+    coreutils
+    utillinux
+    gawk
+    systemd
+  ];
+
+  fixupPhase = ''
+    patchShebangs $out/bin
+
+    wrapProgram $out/bin/rofi-systemd --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = {
+    description = "Control your systemd units using rofi";
+    homepage = https://github.com/IvanMalison/rofi-systemd;
+    maintainers = with stdenv.lib.maintainers; [ imalison ];
+    license = stdenv.lib.licenses.gpl3;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}