youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-25 02:03:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: youwen5:55830d6e6cd36336c26d9da828ab56dcf8601d14
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos
...
compare: youwen5:21f3af9aad90fa5a657ded189daed43ae7d6bea9
Branches Tags
youwen5:main
youwen5:safe-asahi
youwen5:staging
youwen5:asahi-fix
youwen5:asahi-testing
youwen5:next-gen
youwen5:macos-staging
youwen5:macos-working
youwen5:razer-blade
youwen5:darwin
youwen5:liminalos

3 commits
55830d6e6c ... 21f3af9aad

Author SHA1 Message Date
Youwen Wu
21f3af9aad
fix: remove redundant xdg-desktop-portal-hyprland package 2024-09-02 12:58:04 -07:00
Youwen Wu
a56551a140
pkgs: move manual hyprland patch to nixpkgs-small 2024-09-02 09:27:35 -07:00
Youwen Wu
12631b5f6d
flake.lock: update 2024-09-02 09:27:19 -07:00
3 changed files with 17 additions and 41 deletions
Show stats Expand all files Collapse all files

30
flake.lock
View file

@ -25,11 +25,11 @@
}, },
"bleedingpkgs": { "bleedingpkgs": {
"locked": { "locked": {
"lastModified": 1725213346, "lastModified": 1725294213,
"narHash": "sha256-otX9gWWv8XhxOQR2PAN63OzP2ZatNH09eh1yFIVjRYo=", "narHash": "sha256-mtEDY1u6xlw3xRBELGL/X0Su56x6TKxho9k5rDC20SA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6e5af4a4483bd9e71a19a7a59e06fdad54c01401", "rev": "6df34e21fb2730c45f820dc2d733076ae6976dad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -503,11 +503,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725208495, "lastModified": 1725292825,
"narHash": "sha256-7NW3tTjP+RYFAw0LkGD+j3spdJRH3Cm0h97P9vkmdIw=", "narHash": "sha256-c/2wWSOspuoNHpSXdLM7spU6OVfvDjFB5eKVXF4UlEw=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "2f07bccabec4f957f680f6bad4c13256f9aaa91b", "rev": "84fdcb84d65770fa48e2efc19e9fc2d7c36068fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -519,11 +519,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725211546, "lastModified": 1725293683,
"narHash": "sha256-Q6rNz1e0d1Q7Z1K5kh3IXQ+XygOe6CWlP+iYvvPxGhE=", "narHash": "sha256-diX5+ev9ajHXTZ7qs1muO6lOaxwHaX9gVjCtabFdxgc=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "8bc0c0aaed871e8a2fa78422d9df9943d3e04a9f", "rev": "b4131224480d891a427cb5a500af510d4ddc0377",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -742,11 +742,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1725183711, "lastModified": 1725274606,
"narHash": "sha256-gkjg8FfjL92azt3gzZUm1+v+U4y+wbQE630uIf4Aybo=", "narHash": "sha256-xXINAjCR8eTmp3AxZTk/PIH9nNoFNN0OM7MUw6eB7oQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a2c345850e5e1d96c62e7fa8ca6c9d77ebad1c37", "rev": "66a352a3f27a2eb2f27e42a13c6fe245d3be2b98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1041,11 +1041,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725164248, "lastModified": 1725250580,
"narHash": "sha256-fkPtxxfjwoNiV3nZRG0xmQ5Jk7cT0z7dGn2fuV2i6Qo=", "narHash": "sha256-OJ123JRnfuTYp0FYcQuFGvSB9uxw41sIJS6ojStUEkI=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "be4c6a86cd30f29c847412cf4d3463c3113e3c30", "rev": "0f66eb16c0cb63406b8477740ffd41e4e0c301a1",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
modules/linux/desktop-portal/default.nix
View file

@ -1,6 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
xdg.portal = { xdg.portal = {
enable = true; enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-hyprland xdg-desktop-portal-gtk]; extraPortals = with pkgs; [xdg-desktop-portal-gtk];
}; };
} }

26
overlays/default.nix
View file

@ -6,34 +6,10 @@
stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system}; stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system}; bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system}; nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
fetchpatch = pkgs.fetchpatch;
in { in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: { (self: super: {
# manga-tui = inputs.manga-tui.packages.${pkgs.system}.default; xdg-desktop-portal-hyprland = nixpkgs-small.xdg-desktop-portal-hyprland;
xdg-desktop-portal-hyprland = super.xdg-desktop-portal-hyprland.overrideAttrs (oldAttrs: {
src = oldAttrs.src;
patches =
oldAttrs.patches
or []
++ [
# removes wayland-scanner from deps, as it includes a pkg-config that
# defines that it has a non-existent include directory which trips up CMake
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/5555f467f68ce7cdf1060991c24263073b95e9da.patch";
hash = "sha256-yNkg7GCXDPJdsE7M6J98YylnRxQWpcM5N3olix7Oc1A=";
})
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/0dd9af698b9386bcf25d3ea9f5017eca721831c1.patch";
hash = "sha256-Y6eWASHoMXVN2rYJ1rs0jy2qP81/qbHsZU+6b7XNBBg=";
})
# handle finding wayland-scanner more nicely
(fetchpatch {
url = "https://github.com/hyprwm/xdg-desktop-portal-hyprland/commit/2425e8f541525fa7409d9f26a8ffaf92a3767251.patch";
hash = "sha256-6dCg/U/SIjtvo07Z3tn0Hn8Xwx72nwVz6Q2cFnObonU=";
})
];
});
}) })
]; ];
} }