ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 01:57:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156086 from ankhers/river_0_1_2

Browse Source
This commit is contained in:
Sandro 2022-01-25 20:35:54 +01:00 committed by GitHub
commit cd85b9fc42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,13 +19,13 @@
stdenv.mkDerivation rec {
pname = "river";
version = "0.1.0";
version = "0.1.2";
src = fetchFromGitHub {
owner = "ifreund";
owner = "riverwm";
repo = pname;
rev = "v${version}";
sha256 = "03pdgrcpj8db9s14249815z76dyjwwma8xv6p9hpw79flk6rk7v7";
sha256 = "0mysj6fmgiwzrfzm1rk09k4xa9qiqsdwvwr59b4rs010c1gsllwk";
fetchSubmodules = true;
};
@ -55,10 +55,9 @@ stdenv.mkDerivation rec {
runHook postInstall
'';
/*
Builder patch install dir into river to get default config
When installFlags is removed, river becomes half broken.
See https://github.com/ifreund/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
/* Builder patch install dir into river to get default config
When installFlags is removed, river becomes half broken.
See https://github.com/riverwm/river/blob/7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d/river/main.zig#L56
*/
installFlags = [ "DESTDIR=$(out)" ];

5
pkgs/top-level/all-packages.nix
View File

@ -3601,10 +3601,7 @@ with pkgs;
reg = callPackage ../tools/virtualization/reg { };
river = callPackage ../applications/window-managers/river {
wlroots = wlroots_0_14;
zig = zig_0_8_1;
};
river = callPackage ../applications/window-managers/river { };
rivercarro = callPackage ../applications/misc/rivercarro { };