git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #153065 from Synthetica9/wl-mirror-0.8.1
5417153Jörg Thalheim
pkgs/tools/misc/pipectl/default.nixnew file+26
compare with master
unifiedsplit
@@ -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 @@
8, wayland-scanner
8, wayland-scanner
9, wlr-protocols
9, wlr-protocols
10, libGL
10, libGL
11+, installExampleScripts ? true
12+, makeWrapper
13+, pipectl
14+, slurp
15+, rofi
11}:
16}:
12
17
18+let
19+ wl-present-binpath = lib.makeBinPath [
20+ pipectl
21+ rofi
22+ slurp
23+ (placeholder "out")
24+ ];
25+in
26+
13stdenv.mkDerivation rec {
27stdenv.mkDerivation rec {
14 pname = "wl-mirror";
28 pname = "wl-mirror";
15− version = "0.5.0";
29+ version = "0.8.1";
16
30
17 src = fetchFromGitHub {
31 src = fetchFromGitHub {
18 owner = "Ferdi265";
32 owner = "Ferdi265";
19 repo = "wl-mirror";
33 repo = "wl-mirror";
20 rev = "v${version}";
34 rev = "v${version}";
21− sha256 = "1wjdjzj6h1q51yg70gdrq2yrgg6ihamcwhizxfrjq8955yy2y6ly";
35+ hash = "sha256-P5rvZPpIStlOSGj3PaiXAMPWqgWpkC+4IrixEMwoGJU=";
22 };
36 };
23
37
24 patchPhase = ''
38 patchPhase = ''
@@ -27,19 +41,22 @@ stdenv.mkDerivation rec {
27 --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}'
41 --replace 'WLR_PROTOCOL_DIR "/usr' 'WLR_PROTOCOL_DIR "${wlr-protocols}'
28 '';
42 '';
29
43
30− nativeBuildInputs = [ cmake pkg-config wayland-scanner ];
44+ cmakeFlags = [
31− buildInputs = [
45+ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}"
32− libGL
33− wayland
34− wayland-protocols
35− wlr-protocols
36 ];
46 ];
37
47
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+
38 meta = with lib; {
55 meta = with lib; {
39 homepage = "https://github.com/Ferdi265/wl-mirror";
56 homepage = "https://github.com/Ferdi265/wl-mirror";
40 description = "Mirrors an output onto a Wayland surface.";
57 description = "Mirrors an output onto a Wayland surface.";
41 license = licenses.gpl3;
58 license = licenses.gpl3;
42− maintainers = with maintainers; [ twitchyliquid64 ];
59+ maintainers = with maintainers; [ synthetica twitchyliquid64 ];
43 platforms = platforms.linux;
60 platforms = platforms.linux;
44 };
61 };
45}
62}
pkgs/top-level/all-packages.nix+2
@@ -8625,6 +8625,8 @@ with pkgs;
8625
8625
8626 pipe-rename = callPackage ../tools/misc/pipe-rename { };
8626 pipe-rename = callPackage ../tools/misc/pipe-rename { };
8627
8627
8628+ pipectl = callPackage ../tools/misc/pipectl { };
8629+
8628 pitivi = callPackage ../applications/video/pitivi { };
8630 pitivi = callPackage ../applications/video/pitivi { };
8629
8631
8630 prism = callPackage ../applications/video/prism { };
8632 prism = callPackage ../applications/video/prism { };