summary refs log tree commit diff
path: root/pkgs/os-specific/linux/anbox
diff options
context:
space:
mode:
authorFabián Heredia Montiel <fabianhjr@protonmail.com>2021-01-03 15:53:22 -0600
committerFabián Heredia Montiel <fabianhjr@protonmail.com>2021-01-03 19:55:11 -0600
commitbce6d7acfe75fce2f3491bdeefd9881818bec9e5 (patch)
tree7d8a58d68b073d291b783fff51b1c947cc3f518a /pkgs/os-specific/linux/anbox
parent7b041bf2dd5d7d91717b850e28af34918dae3fa6 (diff)
downloadnixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar.gz
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar.bz2
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar.lz
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar.xz
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.tar.zst
nixpkgs-bce6d7acfe75fce2f3491bdeefd9881818bec9e5.zip
anbox: unstable-2019-11-15 -> unstable-2020-11-29
Diffstat (limited to 'pkgs/os-specific/linux/anbox')
-rw-r--r--pkgs/os-specific/linux/anbox/default.nix55
1 files changed, 37 insertions, 18 deletions
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index 5f8ca7ac46f..cf7395788b0 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
+, 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,13 +49,14 @@ 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 = [
@@ -59,13 +64,27 @@ stdenv.mkDerivation rec {
   ];
 
   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