Merge pull request #207065 from hhydraa/master

warpd: 1.3.4 -> 1.3.5

pkgs/applications/misc/warpd/default.nix

@@ -2,35 +2,29 @@
 , stdenv
 , fetchFromGitHub
 , git
-, libXi
+, withWayland ? true, cairo, libxkbcommon, wayland
-, libXinerama
+, withX ? true, libXi, libXinerama, libXft, libXfixes, libXtst, libX11, libXext
-, libXft
-, libXfixes
-, libXtst
-, libX11
-, libXext
-, waylandSupport ? false, cairo, libxkbcommon, wayland
 }:
 
 stdenv.mkDerivation rec {
   pname = "warpd";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
     owner = "rvaiya";
     repo = "warpd";
     rev = "v${version}";
-    sha256 = "sha256-aNv2/+tREvKlpTAsbvmFxkXzONNt73/061i4E3fPFBM=";
+    hash = "sha256-5B3Ec+R1vF2iI0ennYcsRlnFXJkSns0jVbyAWJA4lTU=";
     leaveDotGit = true;
   };
 
   nativeBuildInputs = [ git ];
 
-  buildInputs =  if waylandSupport then [
+  buildInputs = lib.optionals withWayland [
     cairo
     libxkbcommon
     wayland
-  ] else [
+  ] ++ lib.optionals withX [
     libXi
     libXinerama
     libXft
@@ -40,10 +34,12 @@ stdenv.mkDerivation rec {
     libXext
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals waylandSupport [ "PLATFORM=wayland" ];
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ lib.optional (!withWayland) "DISABLE_WAYLAND=y"
+    ++ lib.optional (!withX) "DISABLE_X=y";
 
   postPatch = ''
-    substituteInPlace Makefile \
+    substituteInPlace mk/linux.mk \
       --replace '-m644' '-Dm644' \
       --replace '-m755' '-Dm755' \
       --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \