3p/nixpkgs: drop prison-zxing, upstreamed

This commit is contained in:
Luke Granger-Brown 2023-03-05 12:21:05 +00:00
parent 8c36e4cdae
commit a861c3f460
3 changed files with 2 additions and 21 deletions

View file

@ -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 [

View file

@ -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" ];
}

View file

@ -1,3 +1,2 @@
kubo-multiaddr.patch
prison-zxing.patch
buildrustcrate-aarch64-linux.patch