Unverified Commit 45f8f858 authored by Nikolay Korotkiy's avatar Nikolay Korotkiy Committed by GitHub
Browse files

Merge pull request #200899 from sikmir/slock

slock: 1.4 → 1.5
parents a79542fa 218a36d6
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -4,14 +4,13 @@
# https://git.suckless.org/slock/tree/config.def.h
, conf ? null }:

with lib;
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
  pname = "slock";
  version = "1.4";
  version = "1.5";

  src = fetchurl {
    url = "https://dl.suckless.org/tools/slock-${version}.tar.gz";
    sha256 = "0sif752303dg33f14k6pgwq2jp1hjyhqv6x4sy3sj281qvdljf5m";
    url = "https://dl.suckless.org/tools/slock-${finalAttrs.version}.tar.gz";
    hash = "sha256-ruHj+/aid/tiWjg4BzuXm2SD57rKTOgvVt4f8ZLbDk0=";
  };

  buildInputs = [ xorgproto libX11 libXext libXrandr libxcrypt ];
@@ -20,13 +19,13 @@ stdenv.mkDerivation rec {

  postPatch = "sed -i '/chmod u+s/d' Makefile";

  preBuild = optionalString (conf != null) ''
  preBuild = lib.optionalString (conf != null) ''
    cp ${writeText "config.def.h" conf} config.def.h
  '';

  makeFlags = [ "CC:=$(CC)" ];

  meta = {
  meta = with lib; {
    homepage = "https://tools.suckless.org/slock";
    description = "Simple X display locker";
    longDescription = ''
@@ -36,4 +35,4 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ astsmtl ];
    platforms = platforms.linux;
  };
}
})