ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 12:39:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #307991 from michaeladler/updates/kanshi

Browse Source 
kanshi: 1.5.1 -> 1.6.0
This commit is contained in:
Weijia Wang 2024-04-30 16:47:47 +02:00 committed by GitHub
commit 7425eb68a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/by-name/li/libscfg/package.nix Normal file
View File

@ -0,0 +1,24 @@
{ 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;
};
}

11
pkgs/tools/wayland/kanshi/default.nix
View File

@ -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";