Merge pull request #119836 from sophrosyne97/master

This commit is contained in:
Sandro 2021-04-19 19:21:01 +02:00 committed by GitHub
commit 5c69c99434
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 0 deletions

View File

@ -9197,6 +9197,12 @@
fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1";
}]; }];
}; };
sophrosyne = {
email = "joshuaortiz@tutanota.com";
github = "sophrosyne97";
githubId = 53029739;
name = "Joshua Ortiz";
};
sorki = { sorki = {
email = "srk@48.io"; email = "srk@48.io";
github = "sorki"; github = "sorki";

View File

@ -0,0 +1,35 @@
{ lib, stdenv, fetchFromGitHub, libX11, patches ? [ ], writeText, conf ? null }:
stdenv.mkDerivation {
pname = "dwmblocks";
version = "unstable-2020-12-27";
src = fetchFromGitHub {
owner = "torrinfail";
repo = "dwmblocks";
rev = "96cbb453e5373c05372fd4bf3faacfa53e409067";
sha256 = "00lxfxsrvhm60zzqlcwdv7xkqzya69mgpi2mr3ivzbc8s9h8nwqx";
};
buildInputs = [ libX11 ];
inherit patches;
postPatch =
let
configFile =
if lib.isDerivation conf || builtins.isPath conf
then conf else writeText "blocks.def.h" conf;
in
lib.optionalString (conf != null) "cp ${configFile} blocks.def.h";
makeFlags = [ "PREFIX=$(out)" ];
meta = with lib; {
description = "Modular status bar for dwm written in c";
homepage = "https://github.com/torrinfail/dwmblocks";
license = licenses.isc;
maintainers = with maintainers; [ sophrosyne ];
platforms = platforms.all;
};
}

View File

@ -22551,6 +22551,8 @@ in
dwm = callPackage ../applications/window-managers/dwm { }; dwm = callPackage ../applications/window-managers/dwm { };
dwmblocks = callPackage ../applications/misc/dwmblocks { };
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { }; dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
dynamips = callPackage ../applications/virtualization/dynamips { }; dynamips = callPackage ../applications/virtualization/dynamips { };