diff options
Diffstat (limited to 'pkgs/os-specific/linux/anbox')
-rw-r--r-- | pkgs/os-specific/linux/anbox/default.nix | 61 | ||||
-rw-r--r-- | pkgs/os-specific/linux/anbox/kmod.nix | 15 |
2 files changed, 47 insertions, 29 deletions
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 5f8ca7ac46f..d684e24db91 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl -, cmake, pkgconfig, dbus, makeWrapper -, gtest +{ lib, stdenv, fetchFromGitHub, fetchurl +, 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 = [ + cmake + pkg-config makeWrapper ]; buildInputs = [ - cmake pkgconfig dbus boost libcap gtest systemd mesa glib - SDL2 SDL2_image protobuf protobufc properties-cpp lxc python + boost + dbus + elfutils # libdw + glib + glm + gtest + libbfd + libcap + libdwarf libGL + lxc + mesa + properties-cpp + protobuf protobufc + python3 + SDL2 SDL2_image + systemd ]; - NIX_CFLAGS_COMPILE = "-Wno-error=missing-field-initializers"; - patchPhase = '' patchShebangs scripts @@ -96,7 +115,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/anbox \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [libGL libglvnd]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [libGL libglvnd]} \ --prefix PATH : ${git}/bin mkdir -p $out/share/dbus-1/services @@ -129,7 +148,7 @@ stdenv.mkDerivation rec { }; }.${stdenv.system} or null; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://anbox.io"; description = "Android in a box"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 6eb74ca25f6..9ce65cd8726 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -1,14 +1,14 @@ -{ stdenv, kernel, fetchFromGitHub }: +{ lib, stdenv, kernel, fetchFromGitHub }: stdenv.mkDerivation { pname = "anbox-modules"; - version = "2019-11-15-" + kernel.version; + version = "2020-06-14-${kernel.version}"; src = fetchFromGitHub { owner = "anbox"; repo = "anbox-modules"; - rev = "e0a237e571989987806b32881044c539db25e3e1"; - sha256 = "1km1nslp4f5znwskh4bb1b61r1inw1dlbwiyyq3rrh0f0agf8d0v"; + rev = "98f0f3b3b1eeb5a6954ca15ec43e150b76369086"; + sha256 = "sha256-6xDJQ4YItdbYqle/9VNfOc7D80yFGd9cFyF+CuABaF0="; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -31,13 +31,12 @@ stdenv.mkDerivation { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Anbox ashmem and binder drivers."; homepage = "https://github.com/anbox/anbox-modules"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); + broken = kernel.kernelOlder "4.4" || kernel.kernelAtLeast "5.5"; maintainers = with maintainers; [ edwtjo ]; }; - } |