summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/scrcpy
diff options
context:
space:
mode:
authorVladyslav M <dywedir@gra.red>2019-03-28 17:31:26 +0200
committerVladyslav M <dywedir@gra.red>2019-03-28 17:31:26 +0200
commit1f68bc4b3f9b1eae86ea65c2a885f9a1db2450c7 (patch)
tree1240f7ce033544b3d94e10b40c0963e36e95727c /pkgs/misc/scrcpy
parentdc3ed336df6b14a70e248269672459b499d9bdee (diff)
scrcpy: 1.5 -> 1.8
Diffstat (limited to 'pkgs/misc/scrcpy')
-rw-r--r--pkgs/misc/scrcpy/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 87762eb4b258..20ba1295c422 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -9,33 +9,30 @@
}:
let
- version = "1.5";
+ version = "1.8";
prebuilt_server = fetchurl {
- url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar";
- sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr";
+ url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar";
+ sha256 = "1h755k5xpchlm7wq2yk5mlwjnh7y4yhviffixacby0srj3pmb443";
};
in
stdenv.mkDerivation rec {
- name = "scrcpy-${version}";
+ pname = "scrcpy";
inherit version;
+
src = fetchFromGitHub {
owner = "Genymobile";
- repo = "scrcpy";
- rev = "v${version}-fixversion";
- sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "1cx7y3w699s3i8s53l1mb7lkrnbix457hf17liwh00jzb0i7aga7";
};
# postPatch:
# screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
# This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware.
# It would be better to fix the OpenGL problem, but that seems much more intrusive.
- #
- # command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally.
postPatch = ''
substituteInPlace app/src/screen.c \
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
- substituteInPlace app/src/command.c \
- --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};'
'';
nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];