3p/nixpkgs: drop prison-zxing, upstreamed
This commit is contained in:
parent
8c36e4cdae
commit
a861c3f460
3 changed files with 2 additions and 21 deletions
|
@ -205,8 +205,9 @@ in {
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
# Define a user account.
|
# Define a user account.
|
||||||
|
programs.adb.enable = true;
|
||||||
users.users.lukegb = {
|
users.users.lukegb = {
|
||||||
extraGroups = [ "wheel" "networkmanager" "libvirtd" "lxd" "video" "dialout" ];
|
extraGroups = [ "wheel" "networkmanager" "libvirtd" "lxd" "video" "dialout" "adbusers" ];
|
||||||
};
|
};
|
||||||
my.home-manager.system = {...}: {
|
my.home-manager.system = {...}: {
|
||||||
xsession.windowManager.i3.config.startup = lib.mkAfter [
|
xsession.windowManager.i3.config.startup = lib.mkAfter [
|
||||||
|
|
19
third_party/nixpkgs/patches/prison-zxing.patch
vendored
19
third_party/nixpkgs/patches/prison-zxing.patch
vendored
|
@ -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" ];
|
|
||||||
}
|
|
1
third_party/nixpkgs/patches/series
vendored
1
third_party/nixpkgs/patches/series
vendored
|
@ -1,3 +1,2 @@
|
||||||
kubo-multiaddr.patch
|
kubo-multiaddr.patch
|
||||||
prison-zxing.patch
|
|
||||||
buildrustcrate-aarch64-linux.patch
|
buildrustcrate-aarch64-linux.patch
|
||||||
|
|
Loading…
Reference in a new issue