diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-22 01:17:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-22 01:17:58 +0000 |
| commit | e48c1f8e8c74f44c6f9fa4c33685ca879d2d261e (patch) | |
| tree | 134875c42e9c38508e29be5fad7bed4ba91f90e9 /pkgs/misc/emulators | |
| parent | 27c8ef972cbfc022b01c9f8bc6ac53c39e630eb6 (diff) | |
| parent | b30eaaf6b7c857ef582405672ce3dc247d113b71 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/ruffle/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index b817716075cc..475e54076fc2 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -1,5 +1,6 @@ { alsaLib , fetchFromGitHub +, makeWrapper , openssl , pkg-config , python3 @@ -7,20 +8,22 @@ , lib, stdenv , wayland , xorg +, vulkan-loader }: rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2020-11-30"; + version = "nightly-2021-01-12"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "0z54swzy47laq3smficd3dyrs2zdi3cj2kb0b4hppjxpkkhiw4x0"; + sha256 = "1lywxn61w0b3pb8vjpavd9f3v58gq35ypwp41b7rjkc4rjxmf3cd"; }; nativeBuildInputs = [ + makeWrapper pkg-config python3 ]; @@ -35,9 +38,14 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb xorg.libXrender + vulkan-loader ]; - cargoSha256 = "05kwfcbzjyyfhiqklhhlv06pinzw9bry4j8l9lk3k04c1q30gzkw"; + postInstall = '' + wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ''; + + cargoSha256 = "113gh8nf2fs9shfvnzpwlc7zaq1l9l9jhlybcc4dq0wr4r8qpff5"; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; |