git.iko.soy/typeable/nixpkgs
on master help sign in
hikari: 2.2.2 -> 2.3.0
commit1cb3d84c6aeb75d2a436b027a825850241e695b6 authorPatrick Hilhorst <git@hilhorst.be> dateWed 28 Apr 2021, 08:24 (6 years ago) parentb79d1b5
2 files changed+9−9
pkgs/applications/window-managers/hikari/default.nix+8−6 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/window-managers/hikari/default.nix+8−6
@@ -12,7 +12,7 @@
1212
1313let
1414 pname = "hikari";
15− version = "2.2.2";
15+ version = "2.3.0";
1616in
1717
1818stdenv.mkDerivation {
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
2020
2121 src = fetchzip {
2222 url = "https://hikari.acmelabs.space/releases/${pname}-${version}.tar.gz";
23− sha256 = "0sln1n5f67i3vxkybfi6xhzplb45djqyg272vqkv64m72rmm8875";
23+ sha256 = "0vxwma2r9mb2h0c3dkpvf8dbrc2x2ykhc5bb0vd72sl9pwj4jxmy";
2424 };
2525
2626 nativeBuildInputs = [ pkg-config bmake ];
@@ -49,11 +49,13 @@ stdenv.mkDerivation {
4949 optionalString enabled "WITH_${toUpper feat}=YES"
5050 ) features;
5151
52− # Can't suid in nix store
53− # Run hikari as root (it will drop privileges as early as possible), or create
54− # a systemd unit to give it the necessary permissions/capabilities.
55− patchPhase = ''
52+ postPatch = ''
53+ # Can't suid in nix store
54+ # Run hikari as root (it will drop privileges as early as possible), or create
55+ # a systemd unit to give it the necessary permissions/capabilities.
5656 substituteInPlace Makefile --replace '4555' '555'
57+
58+ sed -i 's@<drm_fourcc.h>@<libdrm/drm_fourcc.h>@' src/*.c
5759 '';
5860
5961 meta = with lib; {
pkgs/top-level/all-packages.nix+1−3
@@ -23787,9 +23787,7 @@ in
2378723787
2378823788 wbg = callPackage ../applications/misc/wbg { };
2378923789
23790− hikari = callPackage ../applications/window-managers/hikari {
23791− wlroots = wlroots_0_12;
23792− };
23790+ hikari = callPackage ../applications/window-managers/hikari { };
2379323791
2379423792 i3 = callPackage ../applications/window-managers/i3 {
2379523793 xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;