Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c9e985469f56
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d638a360331
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 27, 2020

  1. scrcpy: 1.13 -> 1.14

    @dywedir
    dywedir committed May 27, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1418b4 View commit details

Commits on May 28, 2020

  1. Merge pull request #89042 from dywedir/scrcpy

    @dywedir
    dywedir authored May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d638a3 View commit details
Showing with 5 additions and 5 deletions.
  1. +5 −5 pkgs/misc/scrcpy/default.nix
10 changes: 5 additions & 5 deletions pkgs/misc/scrcpy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, makeWrapper
, meson
, ninja
, pkgconfig
, pkg-config
, fetchpatch

, platform-tools
@@ -10,10 +10,10 @@
}:

let
version = "1.13";
version = "1.14";
prebuilt_server = fetchurl {
url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz";
sha256 = "082n57a9lw39lfjxybgim09qf0id9m0rpfb3zmqng58fp2i1h6qx";
};
in
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
owner = "Genymobile";
repo = pname;
rev = "v${version}";
sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby";
sha256 = "1w06gsvgjdbpb9lvvhpjwmysxjl0daiigjfh3cxfgz88447bgw7j";
};

# postPatch:
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
--replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE"
'';

nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ];
nativeBuildInputs = [ makeWrapper meson ninja pkg-config ];

buildInputs = [ ffmpeg SDL2 ];