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: d78f0383c2c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd0daed2e8d5
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 13, 2021

  1. ruffle: nightly-2020-11-30 -> nightly-2021-01-12

    @eduardosm
    eduardosm committed Jan 13, 2021
    Copy the full SHA
    b249fd1 View commit details

Commits on Jan 22, 2021

  1. Merge pull request #109271 from eduardosm/ruffle 

    ruffle: nightly-2020-11-30 -> nightly-2021-01-12
    @SuperSandro2000
    SuperSandro2000 authored Jan 22, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd0daed View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/misc/emulators/ruffle/default.nix
14 changes: 11 additions & 3 deletions pkgs/misc/emulators/ruffle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
{ alsaLib
, fetchFromGitHub
, makeWrapper
, openssl
, pkg-config
, python3
, rustPlatform
, 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.";