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

Commits on Jan 4, 2021

  1. anbox: unstable-2019-11-15 -> unstable-2020-11-29

    @fabianhjr
    fabianhjr committed Jan 4, 2021
    Copy the full SHA
    bce6d7a View commit details

Commits on Jan 5, 2021

  1. Merge pull request #108351 from LibreCybernetics/update-anbox 

    anbox: unstable-2019-11-15 -> unstable-2020-11-29
    @kevincox
    kevincox authored Jan 5, 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
    d897e8e View commit details
Showing with 37 additions and 18 deletions.
  1. +37 −18 pkgs/os-specific/linux/anbox/default.nix
55 changes: 37 additions & 18 deletions pkgs/os-specific/linux/anbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{ stdenv, fetchFromGitHub, fetchurl
, cmake, pkgconfig, dbus, makeWrapper
, gtest
, cmake, pkg-config, dbus, makeWrapper
, boost
, elfutils # for libdw
, git
, glib
, glm
, gtest
, libbfd
, libcap
, systemd
, mesa
, libdwarf
, libGL
, libglvnd
, glib
, git
, SDL2
, SDL2_image
, lxc
, mesa
, properties-cpp
, protobuf
, protobufc
, python
, lxc
, python3
, runtimeShell
, SDL2
, SDL2_image
, systemd
, writeText
, writeScript
, runtimeShell
}:

let
@@ -45,27 +49,42 @@ in

stdenv.mkDerivation rec {
pname = "anbox";
version = "unstable-2019-11-15";
version = "unstable-2020-11-29";

src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "0a49ae08f76de7f886a3dbed4422711c2fa39d10";
sha256 = "09l56nv9cnyhykclfmvam6bkcxlamwbql6nrz9n022553w92hkjf";
rev = "6c10125a7f13908d2cbe56d2d9ab09872755f265";
sha256 = "00bqssh4zcs0jj6w07b91719xkrpdw75vpcplwrvlhwsvl55f901";
fetchSubmodules = true;
};

nativeBuildInputs = [
makeWrapper
];

buildInputs = [
cmake pkgconfig dbus boost libcap gtest systemd mesa glib
SDL2 SDL2_image protobuf protobufc properties-cpp lxc python
boost
cmake
dbus
elfutils # libdw
glib
glm
gtest
libbfd
libcap
libdwarf
libGL
lxc
mesa
pkg-config
properties-cpp
protobuf protobufc
python3
SDL2 SDL2_image
systemd
];

NIX_CFLAGS_COMPILE = "-Wno-error=missing-field-initializers";

patchPhase = ''
patchShebangs scripts