aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/misc/scrcpy
diff options
context:
space:
mode:
authorKaiden Fey <kookie@spacekookie.de>2020-09-19 15:00:33 +0200
committerKatharina Fey <kookie@spacekookie.de>2020-09-19 15:00:33 +0200
commite0800985dab8f8ebb4cebdfd7e361fd1fafdb2a7 (patch)
tree289f43c72dd1fffeec4eb18ced05ae91e50c179a /nixpkgs/pkgs/misc/scrcpy
parent5581b5521e14317c3507a6e8451a3f14996e5c4d (diff)
parent441a7da8080352881bb52f85e910d8855e83fc55 (diff)
Merge commit '441a7da8080352881bb52f85e910d8855e83fc55'
Diffstat (limited to 'nixpkgs/pkgs/misc/scrcpy')
-rw-r--r--nixpkgs/pkgs/misc/scrcpy/default.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/misc/scrcpy/default.nix b/nixpkgs/pkgs/misc/scrcpy/default.nix
index 2f0d184402f..adebcbd633d 100644
--- a/nixpkgs/pkgs/misc/scrcpy/default.nix
+++ b/nixpkgs/pkgs/misc/scrcpy/default.nix
@@ -5,15 +5,15 @@
, fetchpatch
, platform-tools
-, ffmpeg_3
+, ffmpeg
, SDL2
}:
let
- version = "1.14";
+ version = "1.15.1";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
- sha256 = "082n57a9lw39lfjxybgim09qf0id9m0rpfb3zmqng58fp2i1h6qx";
+ sha256 = "1hrp2rfwl06ff2b2i12ccka58l1brvn6xqgm1f38k36s61mbs1py";
};
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
- sha256 = "1w06gsvgjdbpb9lvvhpjwmysxjl0daiigjfh3cxfgz88447bgw7j";
+ sha256 = "0ijar1cycj42p39cgpnwdwr6nz5pyr6vacr1gvc0f6k92pl8vr13";
};
# postPatch:
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ];
- buildInputs = [ ffmpeg_3 SDL2 ];
+ buildInputs = [ ffmpeg SDL2 ];
# Manually install the server jar to prevent Meson from "fixing" it
preConfigure = ''