git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #153065 from Synthetica9/wl-mirror-0.8.1

wl-mirror: 0.5.0 -> 0.8.1

commit5417153c0b295edd1d6da3fbed7dc56fe08cdef3 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 1 Jan 2022, 13:51 (5 years ago) parent48205e409a558e
3 files changed+54−9
pkgs/tools/misc/pipectl/default.nix+26 pkgs/tools/wayland/wl-mirror/default.nix+26−9 pkgs/top-level/all-packages.nix+2
pkgs/tools/misc/pipectl/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ stdenv
2+, lib
3+, fetchFromGitHub
4+, cmake
5+}:
6+
7+stdenv.mkDerivation rec {
8+ pname = "pipectl";
9+ version = "0.2.2";
10+
11+ src = fetchFromGitHub {
12+ owner = "Ferdi265";
13+ repo = pname;
14+ rev = "v${version}";
15+ hash = "sha256-wa/SKKNXkl8XxE7XORodoAlrMc2QNGXGPE+/yya209Y=";
16+ };
17+
18+ nativeBuildInputs = [ cmake ];
19+
20+ meta = with lib; {
21+ homepage = "https://github.com/Ferdi265/pipectl";
22+ license = licenses.gpl3;
23+ description = "a simple named pipe management utility";
24+ maintainers = with maintainers; [ synthetica ];
25+ };
26+}
pkgs/tools/wayland/wl-mirror/default.nix+26−9
@@ -8,17 +8,31 @@
88, wayland-scanner
99, wlr-protocols
1010, libGL
11+, installExampleScripts ? true
12+, makeWrapper
13+, pipectl
14+, slurp
15+, rofi
1116}:
1217
18+let
19+ wl-present-binpath = lib.makeBinPath [
20+ pipectl
21+ rofi
22+ slurp
23+ (placeholder "out")
24+ ];
25+in
26+
1327stdenv.mkDerivation rec {
1428 pname = "wl-mirror";
15− version = "0.5.0";
29+ version = "0.8.1";
1630
1731 src = fetchFromGitHub {
1832 owner = "Ferdi265";
1933 repo = "wl-mirror";
2034 rev = "v${version}";
21− sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly";
35+ hash = "sha256-P5rvZPpIStlOSGj3PaiXAMPWqgWpkC+4IrixEMwoGJU=";
2236 };
2337
2438 patchPhase = ''
@@ -27,19 +41,22 @@ stdenv.mkDerivation rec {
2741 --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}'
2842 '';
2943
30− nativeBuildInputs = [ cmake pkg-config wayland-scanner ];
31− buildInputs = [
32− libGL
33− wayland
34− wayland-protocols
35− wlr-protocols
44+ cmakeFlags = [
45+ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}"
3646 ];
3747
48+ postInstall = lib.optionalString installExampleScripts ''
49+ wrapProgram $out/bin/wl-present --prefix PATH ":" ${wl-present-binpath}
50+ '';
51+
52+ nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ];
53+ buildInputs = [ libGL wayland wayland-protocols wlr-protocols ];
54+
3855 meta = with lib; {
3956 homepage = "https://github.com/Ferdi265/wl-mirror";
4057 description = "Mirrors an output onto a Wayland surface.";
4158 license = licenses.gpl3;
42− maintainers = with maintainers; [ twitchyliquid64 ];
59+ maintainers = with maintainers; [ synthetica twitchyliquid64 ];
4360 platforms = platforms.linux;
4461 };
4562}
pkgs/top-level/all-packages.nix+2
@@ -8625,6 +8625,8 @@ with pkgs;
86258625
86268626 pipe-rename = callPackage ../tools/misc/pipe-rename { };
86278627
8628+ pipectl = callPackage ../tools/misc/pipectl { };
8629+
86288630 pitivi = callPackage ../applications/video/pitivi { };
86298631
86308632 prism = callPackage ../applications/video/prism { };