diff --git a/overlays/default.nix b/overlays/default.nix index 6b7a356..a35c045 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -17,6 +17,6 @@ in { nur = import ./nur.nix pkgs; unstable = importWrapper ./unstable.nix; custom = import ./custom.nix pkgs; - simple = import ./simple.nix pkgs; + simple = import ./simple.nix; surface = import ./surface.nix pkgs; } diff --git a/overlays/simple.nix b/overlays/simple.nix index 208258e..4141bb7 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -1,4 +1,4 @@ -pkgs: final: prev: +final: prev: let # NOTE: For some reason --fs-screen-name and --screen-name are not in @@ -26,11 +26,11 @@ in { }); animedl = prev.animedl.overrideAttrs (old: { - extraPkgs = pkgs: with pkgs; [ mpv ]; + extraPkgs = pkgs: with final; [ mpv ]; }); retroarch = prev.retroarch.override (old: { - cores = with pkgs.libretro; [ + cores = with prev.libretro; [ desmume sameboy mgba @@ -55,4 +55,19 @@ in { sha256 = "05aih05z5dybbv67qjmn90yjrk1k2l0v83hhglqqdin18k5xhq21"; }; }); + + phosh = prev.unstable.phosh.overrideAttrs (old: rec { + patches = [ + #(prev.fetchpatch { + # name = "904-allow-non-numeric-passwords-in-lockscreen.patch"; + # url = "https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/904.patch"; + # sha256 = "0w349cwfcp9a7hg137l7q45626sggl441mwnf0rx6rwjgn1kd48d"; + #}) + (prev.fetchpatch { + name = "923-allow-non-numeric-passwords-in-lockscreen.patch"; + url = "https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/923.diff"; + sha256 = "168rmcwmyvyhb8xrlrrp3na44h0mda3dkk8iswak6jr2pvxdb30z"; + }) + ]; + }); }