Unverified Commit 7425eb68 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #307991 from michaeladler/updates/kanshi 

kanshi: 1.5.1 -> 1.6.0
parents fd1f945e 7d80dc71

pkgs/by-name/li/libscfg/package.nix

0 → 100644
+24 −0
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromSourcehut, meson, ninja, pkg-config, wayland }:



stdenv.mkDerivation rec {

  pname = "libscfg";

  version = "0.1.1";



  src = fetchFromSourcehut {

    owner = "~emersion";

    repo = "libscfg";

    rev = "v${version}";

    sha256 = "sha256-aTcvs7QuDOx17U/yP37LhvIGxmm2WR/6qFYRtfjRN6w=";

  };



  nativeBuildInputs = [ meson ninja pkg-config ];

  buildInputs = [ wayland ];



  meta = with lib; {

    homepage = "https://sr.ht/~emersion/libscfg";

    description = "A simple configuration file format";

    license = licenses.mit;

    maintainers = with maintainers; [ michaeladler ];

    platforms = platforms.linux;

  };

}

pkgs/tools/wayland/kanshi/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -8,17 +8,18 @@ 
, wayland

, wayland-scanner

, libvarlink

, libscfg

}:



stdenv.mkDerivation rec {

  pname = "kanshi";

  version = "1.5.1";

  version = "1.6.0";



  src = fetchFromSourcehut {

    owner = "~emersion";

    repo = "kanshi";

    rev = "v${version}";

    sha256 = "sha256-Ck0yRt9TYLFRojn+VKnjP5RzkX0hciuQOT6drTH7gtU=";

    sha256 = "sha256-KjP7EdssaZwa1OupLQgzwJSAADKLsjHltEavPjsS1YM=";

  };



  strictDeps = true;
@@ -26,7 +27,11 @@ stdenv.mkDerivation rec { 
    pkg-config

  ];

  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

  buildInputs = [ wayland libvarlink ];

  buildInputs = [ wayland libvarlink libscfg ];



  env.NIX_CFLAGS_COMPILE = toString [

    "-Wno-error=maybe-uninitialized"

  ];



  meta = with lib; {

    homepage = "https://sr.ht/~emersion/kanshi";