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

Compare commits

base: youwen5:797260a0e94074f3eda31b19abb1018f3068b17a
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:becc60243a9750d0692f2b7846dd11b5a3055389
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

4 commits
797260a0e9 ... becc60243a

Author SHA1 Message Date
Youwen Wu
becc60243a
fix: build properly on asahi 2024-09-01 13:10:58 -07:00
Youwen Wu
fe99a1fc9d
flake.lock: update zen-browser 2024-09-01 11:59:20 -07:00
Youwen Wu
11225b7d15
fix: xdg-desktop-portal-hyprland build failure 2024-09-01 11:48:31 -07:00
Youwen Wu
a5457273d0
flake.lock: update 2024-09-01 11:48:15 -07:00
3 changed files with 65 additions and 40 deletions
Show stats Expand all files Collapse all files

77
flake.lock
View file

@ -9,26 +9,27 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722469787, "lastModified": 1725213692,
"narHash": "sha256-P20oAmbgXHl1E77TXPXiAj1Ntycc1mf7fZMI7X13VYw=", "narHash": "sha256-owQBVWS05OKLjDrPkQW5+gGz/SNgIF7/9nZLkZ0bkFw=",
"owner": "tpwrules", "owner": "rowanG077",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "8a665fee82901878edaeb8ee120296a979db2dd2", "rev": "fc4503fa956c4f07b5cb0b7d446a04be25786402",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tpwrules", "owner": "rowanG077",
"ref": "fix-mesa",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"type": "github" "type": "github"
} }
}, },
"bleedingpkgs": { "bleedingpkgs": {
"locked": { "locked": {
"lastModified": 1725052531, "lastModified": 1725213346,
"narHash": "sha256-eRSWmpnh2/6atOM+DkCrf+VBZqg2NxSh9Up2lK6/B0M=", "narHash": "sha256-otX9gWWv8XhxOQR2PAN63OzP2ZatNH09eh1yFIVjRYo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30eba5df5538ec46ada854167701bb7c8e42956e", "rev": "6e5af4a4483bd9e71a19a7a59e06fdad54c01401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +465,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724435763, "lastModified": 1725180166,
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +503,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725053837, "lastModified": 1725208495,
"narHash": "sha256-ERGXSQGANg73hrXK9/P5DP5b49hmfJNAAY5sXppZeZw=", "narHash": "sha256-7NW3tTjP+RYFAw0LkGD+j3spdJRH3Cm0h97P9vkmdIw=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "81519d551a2908c0ec19a98cbe5df779fd390a51", "rev": "2f07bccabec4f957f680f6bad4c13256f9aaa91b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +519,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725053336, "lastModified": 1725211546,
"narHash": "sha256-L/krhMEEm2eN9kKpcczRVLChl0iqghTs8LSuFr5qOMA=", "narHash": "sha256-Q6rNz1e0d1Q7Z1K5kh3IXQ+XygOe6CWlP+iYvvPxGhE=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "9be33f9f1c6ad4dcb91508431bfd6f500f2a422f", "rev": "8bc0c0aaed871e8a2fa78422d9df9943d3e04a9f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -601,11 +602,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1725041447, "lastModified": 1725205946,
"narHash": "sha256-ueGJZ8PzrlEx3mLSFz7NhJDNcX3mLwAs6SGSuhxBMnQ=", "narHash": "sha256-86q7PBqvlB6Sr7CzgfM/RgrvlqFTLb7xFgVI1cPNtZE=",
"owner": "josueBarretogit", "owner": "josueBarretogit",
"repo": "manga-tui", "repo": "manga-tui",
"rev": "26313d00fcecb4bc95a651a2b7e7a030c7fcf621", "rev": "3ce3366bf3a0e66a025b3dd7e754f9f346331d82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -621,11 +622,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724994893, "lastModified": 1725189302,
"narHash": "sha256-yutISDGg6HUaZqCaa54EcsfTwew3vhNtt/FNXBBo44g=", "narHash": "sha256-IhXok/kwQqtusPsoguQLCHA+h6gKvgdCrkhIaN+kByA=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c8d3157d1f768e382de5526bb38e74d2245cad04", "rev": "7c4b53a7d9f3a3df902b3fddf2ae245ef20ebcda",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +742,11 @@
}, },
"nixpkgs-unstable-small": { "nixpkgs-unstable-small": {
"locked": { "locked": {
"lastModified": 1725009565, "lastModified": 1725183711,
"narHash": "sha256-uTfnGf6ZJ0oTTdUbs41d08d56u7jcTSlwCuI753rTWc=", "narHash": "sha256-gkjg8FfjL92azt3gzZUm1+v+U4y+wbQE630uIf4Aybo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "58939e5336bc0fa75e52df42bdc48bc66d5796e0", "rev": "a2c345850e5e1d96c62e7fa8ca6c9d77ebad1c37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -786,11 +787,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1724819573, "lastModified": 1725103162,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +1041,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724991403, "lastModified": 1725164248,
"narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=", "narHash": "sha256-fkPtxxfjwoNiV3nZRG0xmQ5Jk7cT0z7dGn2fuV2i6Qo=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "0965e58aa38245b2105fec2949a9463fe34e3f05", "rev": "be4c6a86cd30f29c847412cf4d3463c3113e3c30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1055,11 +1056,11 @@
}, },
"stablepkgs": { "stablepkgs": {
"locked": { "locked": {
"lastModified": 1724855419, "lastModified": 1725001927,
"narHash": "sha256-WXHSyOF4nBX0cvHN3DfmEMcLOVdKH6tnMk9FQ8wTNRc=", "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ae2fc9e0e42caaf3f068c1bfdc11c71734125e06", "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1221,11 +1222,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1725053855, "lastModified": 1725096998,
"narHash": "sha256-x0QWLJAF2bXPcjzoqTQMN022oN9wuSbDvqgZuG1XxY0=", "narHash": "sha256-ylP5YehroiFnf1AIT5yq1mcc8HUVlj9ItsWCtY6J6ck=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "63438969a0c83f857880a45f1e29045efa526ea4", "rev": "cfc894abb631e3ea61ff590b7520d79d35a26366",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -49,7 +49,7 @@
}; };
apple-silicon = { apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon"; url = "github:rowanG077/nixos-apple-silicon/fix-mesa";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

26
overlays/default.nix
View file

@ -6,10 +6,34 @@
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; # manga-tui = inputs.manga-tui.packages.${pkgs.system}.default;
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=";
})
];
});
}) })
]; ];
} }