nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-11 14:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #269623 from GaetanLepage/river

Browse Source 
river: 0.2.4 -> 0.2.5, rivercarro: 0.1.4 -> 0.3.0
This commit is contained in:
Adam C. Stephens 2023-11-24 10:34:46 -05:00 committed by GitHub
commit b2063364e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/misc/rivercarro/default.nix
View File

@ -4,26 +4,28 @@
, pkg-config , pkg-config
, river , river
, wayland , wayland
, zig_0_9 , wayland-protocols
, zig_0_11
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rivercarro"; pname = "rivercarro";
version = "0.1.4"; version = "0.3.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~novakane"; owner = "~novakane";
repo = "rivercarro"; repo = "rivercarro";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-eATbbwIt5ytEVLPodyq9vFF9Rs5S1xShpvNYQnfwdV4="; hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
river river
wayland wayland
zig_0_9.hook wayland-protocols
zig_0_11.hook
]; ];
meta = with lib; { meta = with lib; {
@ -42,6 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}"; changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ kraem ]; maintainers = with maintainers; [ kraem ];
inherit (zig_0_9.meta) platforms; inherit (zig_0_11.meta) platforms;
}; };
}) })

8
pkgs/applications/window-managers/river/default.nix
View File

@ -14,14 +14,14 @@
, wayland-protocols , wayland-protocols
, wlroots_0_16 , wlroots_0_16
, xwayland , xwayland
, zig_0_10 , zig_0_11
, withManpages ? true , withManpages ? true
, xwaylandSupport ? true , xwaylandSupport ? true
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "river"; pname = "river";
version = "0.2.4"; version = "0.2.5";
outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: {
repo = "river"; repo = "river";
rev = "refs/tags/v${finalAttrs.version}"; rev = "refs/tags/v${finalAttrs.version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-cIcO6owM6eYn+obYVaBOVQpnBx4++KOqQk5Hzo3GcNs="; hash = "sha256-Xd9hg7UGTBlEyw8BDpTQYq/IRC7vUXhMx9j7YcCaQ20=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
wayland wayland
xwayland xwayland
zig_0_10.hook zig_0_11.hook
] ]
++ lib.optional withManpages scdoc; ++ lib.optional withManpages scdoc;