pyrox.dev
warpd: 1.3.4 -> 1.3.5
fix
formatting fixes
+10
-14
pkgs/applications/misc/warpd/default.nix
+10
-14
pkgs/applications/misc/warpd/default.nix
···
2
2
, stdenv
3
3
, fetchFromGitHub
4
4
, git
5
-
, libXi
6
-
, libXinerama
7
-
, libXft
8
-
, libXfixes
9
-
, libXtst
10
-
, libX11
11
-
, libXext
12
-
, waylandSupport ? false, cairo, libxkbcommon, wayland
5
+
, withWayland ? true, cairo, libxkbcommon, wayland
6
+
, withX ? true, libXi, libXinerama, libXft, libXfixes, libXtst, libX11, libXext
13
7
}:
14
8
15
9
stdenv.mkDerivation rec {
16
10
pname = "warpd";
17
-
version = "1.3.4";
11
+
version = "1.3.5";
18
12
19
13
src = fetchFromGitHub {
20
14
owner = "rvaiya";
21
15
repo = "warpd";
22
16
rev = "v${version}";
23
-
sha256 = "sha256-aNv2/+tREvKlpTAsbvmFxkXzONNt73/061i4E3fPFBM=";
17
+
hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU=";
24
18
leaveDotGit = true;
25
19
};
26
20
27
21
nativeBuildInputs = [ git ];
28
22
29
-
buildInputs = if waylandSupport then [
23
+
buildInputs = lib.optionals withWayland [
30
24
cairo
31
25
libxkbcommon
32
26
wayland
33
-
] else [
27
+
] ++ lib.optionals withX [
34
28
libXi
35
29
libXinerama
36
30
libXft
···
40
34
libXext
41
35
];
42
36
43
-
makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals waylandSupport [ "PLATFORM=wayland" ];
37
+
makeFlags = [ "PREFIX=$(out)" ]
38
+
++ lib.optional (!withWayland) "DISABLE_WAYLAND=y"
39
+
++ lib.optional (!withX) "DISABLE_X=y";
44
40
45
41
postPatch = ''
46
-
substituteInPlace Makefile \
42
+
substituteInPlace mk/linux.mk \
47
43
--replace '-m644' '-Dm644' \
48
44
--replace '-m755' '-Dm755' \
49
45
--replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \