From 12042577a13551a64d5a64659189f6daa8494e51 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Mon, 30 Jul 2018 21:49:18 -0500 Subject: [PATCH 1/3] Add lukeadams as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b5fbd67dfb..bea6016ddd3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2264,6 +2264,11 @@ github = "luispedro"; name = "Luis Pedro Coelho"; }; + lukeadams = { + email = "luke.adams@belljar.io"; + github = "lukeadams"; + name = "Luke Adams"; + }; lukego = { email = "luke@snabb.co"; github = "lukego"; From 690d6fe8000f2ca79d8dde7c585601cb22edc5d4 Mon Sep 17 00:00:00 2001 From: Duarte David Date: Wed, 25 Jul 2018 11:28:34 -0500 Subject: [PATCH 2/3] Add deltaevo as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bea6016ddd3..f628d3d8d71 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -926,6 +926,11 @@ github = "deepfire"; name = "Kosyrev Serge"; }; + deltaevo = { + email = "deltaduartedavid@gmail.com"; + github = "DeltaEvo"; + name = "Duarte David"; + }; demin-dmitriy = { email = "demindf@gmail.com"; github = "demin-dmitriy"; From 06b429062f74590ef3fb7e9d85f2a9f0ff9dfa0a Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Sun, 29 Jul 2018 13:42:16 -0500 Subject: [PATCH 3/3] scrcpy: init at v1.2 --- pkgs/misc/scrcpy/default.nix | 52 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/misc/scrcpy/default.nix diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix new file mode 100644 index 00000000000..49c1178c83a --- /dev/null +++ b/pkgs/misc/scrcpy/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +, meson +, ninja +, pkgconfig + +, platformTools +, ffmpeg +, SDL2 +}: + +let + version = "1.2"; + prebuilt_server = fetchurl { + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; + sha256 = "0q0zyqw7y33r9ybjp8ay6yac7ifca1lq14pjvw6x78zxs976affb"; + }; +in +stdenv.mkDerivation rec { + name = "scrcpy-${version}"; + inherit version; + src = fetchFromGitHub { + owner = "Genymobile"; + repo = "scrcpy"; + rev = "v${version}"; + sha256 = "01zw6h6mz2cwqfh9lwypm8pbfx9m9df91l1fq1i0f1d8v49x8wqc"; + }; + + nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ]; + + buildInputs = [ ffmpeg SDL2 ]; + + # Manually install the server jar to prevent Meson from "fixing" it + preConfigure = '' + echo -n > server/meson.build + ''; + + postInstall = '' + mkdir -p "$out/share/scrcpy" + ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" + + # runtime dep on `adb` to push the server + wrapProgram "$out/bin/scrcpy" --prefix PATH : "${platformTools}/bin" + ''; + + meta = with stdenv.lib; { + description = "Display and control Android devices over USB or TCP/IP"; + homepage = https://github.com/Genymobile/scrcpy; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ deltaevo lukeadams ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 941b3c6310c..6a99c3b4eb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5012,6 +5012,10 @@ with pkgs; inherit (darwin.apple_sdk.libs) utmp; }; + scrcpy = callPackage ../misc/scrcpy { + inherit (androidenv) platformTools; + }; + screen-message = callPackage ../tools/X11/screen-message { }; screencloud = callPackage ../applications/graphics/screencloud {