remove phosh patch and use upstream diff
This commit is contained in:
11
flake.nix
11
flake.nix
@@ -45,12 +45,19 @@
|
|||||||
name = "nixpkgs-patched-uninsane";
|
name = "nixpkgs-patched-uninsane";
|
||||||
src = basePkgs;
|
src = basePkgs;
|
||||||
patches = [
|
patches = [
|
||||||
# for mobile: allow phoc to scale to non-integer values
|
# phosh: allow fractional scaling
|
||||||
./nixpatches/01-phosh-float-scale.patch
|
(basePkgs.legacyPackages.${system}.fetchpatch {
|
||||||
|
url = "https://github.com/NixOS/nixpkgs/pull/175872.diff";
|
||||||
|
sha256 = "sha256-mEmqhe8DqlyCxkFWQKQZu+2duz69nOkTANh9TcjEOdY=";
|
||||||
|
})
|
||||||
# for raspberry pi: allow building u-boot for rpi 4{,00}
|
# for raspberry pi: allow building u-boot for rpi 4{,00}
|
||||||
|
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018
|
||||||
./nixpatches/02-rpi4-uboot.patch
|
./nixpatches/02-rpi4-uboot.patch
|
||||||
|
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176476
|
||||||
./nixpatches/03-whalebird-4.6.0.patch
|
./nixpatches/03-whalebird-4.6.0.patch
|
||||||
|
# alternative to https://github.com/NixOS/nixpkgs/pull/173200
|
||||||
./nixpatches/04-dart-2.7.0.patch
|
./nixpatches/04-dart-2.7.0.patch
|
||||||
|
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176476
|
||||||
./nixpatches/05-whalebird-aarch64.patch
|
./nixpatches/05-whalebird-aarch64.patch
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@@ -1,19 +0,0 @@
|
|||||||
diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix
|
|
||||||
index 4bf78fa16e7..13f7b3fbef2 100644
|
|
||||||
--- a/nixos/modules/services/x11/desktop-managers/phosh.nix
|
|
||||||
+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
|
|
||||||
@@ -78,7 +78,13 @@ let
|
|
||||||
description = ''
|
|
||||||
Display scaling factor.
|
|
||||||
'';
|
|
||||||
- type = types.nullOr types.ints.unsigned;
|
|
||||||
+ type = types.nullOr (
|
|
||||||
+ types.addCheck
|
|
||||||
+ (types.either types.int types.float)
|
|
||||||
+ (x : x > 0)
|
|
||||||
+ ) // {
|
|
||||||
+ description = "null or positive integer or float";
|
|
||||||
+ };
|
|
||||||
default = null;
|
|
||||||
example = 2;
|
|
||||||
};
|
|
Reference in New Issue
Block a user