diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix index c665ccabeb..989bdf4ec6 100644 --- a/ops/nixos/porcorosso/default.nix +++ b/ops/nixos/porcorosso/default.nix @@ -205,8 +205,9 @@ in { hardware.bluetooth.enable = true; # Define a user account. + programs.adb.enable = true; users.users.lukegb = { - extraGroups = [ "wheel" "networkmanager" "libvirtd" "lxd" "video" "dialout" ]; + extraGroups = [ "wheel" "networkmanager" "libvirtd" "lxd" "video" "dialout" "adbusers" ]; }; my.home-manager.system = {...}: { xsession.windowManager.i3.config.startup = lib.mkAfter [ diff --git a/third_party/nixpkgs/patches/prison-zxing.patch b/third_party/nixpkgs/patches/prison-zxing.patch deleted file mode 100644 index 393a21056b..0000000000 --- a/third_party/nixpkgs/patches/prison-zxing.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix ---- a/pkgs/development/libraries/kde-frameworks/prison.nix -+++ b/pkgs/development/libraries/kde-frameworks/prison.nix -@@ -2,12 +2,13 @@ - mkDerivation, - extra-cmake-modules, - libdmtx, qrencode, qtbase, -+ qtmultimedia, zxing-cpp, - }: - - mkDerivation { - pname = "prison"; - nativeBuildInputs = [ extra-cmake-modules ]; -- buildInputs = [ libdmtx qrencode ]; -- propagatedBuildInputs = [ qtbase ]; -+ buildInputs = [ libdmtx qrencode zxing-cpp ]; -+ propagatedBuildInputs = [ qtbase qtmultimedia ]; - outputs = [ "out" "dev" ]; - } diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index d9d628e304..2f2fbd7867 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,3 +1,2 @@ kubo-multiaddr.patch -prison-zxing.patch buildrustcrate-aarch64-linux.patch