Compare commits
2 Commits
7b07ae7983
...
95f3aa39c8
Author | SHA1 | Date | |
---|---|---|---|
95f3aa39c8 | |||
a41bd02ca4 |
16
flake.nix
16
flake.nix
@ -263,8 +263,7 @@
|
|||||||
atool-wrapped = packages.atool;
|
atool-wrapped = packages.atool;
|
||||||
};
|
};
|
||||||
|
|
||||||
zen-browser-overlay = final: prev:
|
zen-browser-overlay = final: prev: let
|
||||||
let
|
|
||||||
inherit (final) system callPackage;
|
inherit (final) system callPackage;
|
||||||
|
|
||||||
input = inputs.zen-browser;
|
input = inputs.zen-browser;
|
||||||
@ -272,11 +271,14 @@
|
|||||||
sources = builtins.fromJSON (builtins.readFile (input + "/sources.json"));
|
sources = builtins.fromJSON (builtins.readFile (input + "/sources.json"));
|
||||||
|
|
||||||
warnExists = name: value: let
|
warnExists = name: value: let
|
||||||
pass = if prev ? ${name} then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value else value;
|
pass =
|
||||||
in pass;
|
if prev ? ${name}
|
||||||
in
|
then builtins.warn "zen-browser-overlay: Package `${name}` already exists. This overlay is no longer needed and should be removed." value
|
||||||
{
|
else value;
|
||||||
zen-browser-bin = callPackage packages.zen-browser.override { };
|
in
|
||||||
|
pass;
|
||||||
|
in {
|
||||||
|
zen-browser-bin = callPackage packages.zen-browser.override {};
|
||||||
zen-browser-unwrapped = warnExists "zen-browser-unwrapped" (callPackage packages.zen-browser-unwrapped.override {
|
zen-browser-unwrapped = warnExists "zen-browser-unwrapped" (callPackage packages.zen-browser-unwrapped.override {
|
||||||
inherit (sources.${system}) hash url;
|
inherit (sources.${system}) hash url;
|
||||||
inherit (sources) version;
|
inherit (sources) version;
|
||||||
|
@ -7,10 +7,6 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
cfg = config.nixfiles.packageSets.communication;
|
cfg = config.nixfiles.packageSets.communication;
|
||||||
rustdesk-pkg =
|
|
||||||
if (lib.strings.hasInfix "23.11" lib.version)
|
|
||||||
then inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.rustdesk-flutter
|
|
||||||
else pkgs.rustdesk-flutter;
|
|
||||||
|
|
||||||
vesktop-ozone-cmd = let
|
vesktop-ozone-cmd = let
|
||||||
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
extraFlags = lib.optionalString config.nixfiles.workarounds.nvidiaPrimary " --disable-gpu";
|
||||||
@ -52,7 +48,7 @@ in {
|
|||||||
signal-desktop
|
signal-desktop
|
||||||
thunderbird
|
thunderbird
|
||||||
vesktop
|
vesktop
|
||||||
rustdesk-pkg
|
rustdesk-flutter
|
||||||
tor-browser
|
tor-browser
|
||||||
onionshare
|
onionshare
|
||||||
]
|
]
|
||||||
|
@ -9,7 +9,10 @@
|
|||||||
# not high priority, this still works well for this overlay.
|
# not high priority, this still works well for this overlay.
|
||||||
nixfiles = self;
|
nixfiles = self;
|
||||||
overlay = final: prev: let
|
overlay = final: prev: let
|
||||||
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {inherit (prev) system;};
|
pkgsStable = import nixfiles.inputs.nixpkgs.outPath {
|
||||||
|
inherit (prev) system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
|
updateTime = nixfiles.inputs.nixpkgs-unstable.lastModified;
|
||||||
|
|
||||||
inherit (final) callPackage fetchFromGitHub;
|
inherit (final) callPackage fetchFromGitHub;
|
||||||
@ -84,6 +87,13 @@
|
|||||||
inherit (prev) redlib;
|
inherit (prev) redlib;
|
||||||
in
|
in
|
||||||
pickNewer redlib-new redlib;
|
pickNewer redlib-new redlib;
|
||||||
|
|
||||||
|
rustdesk-flutter = let
|
||||||
|
stable = pkgsStable.rustdesk-flutter;
|
||||||
|
unstable = prev.rustdesk-flutter;
|
||||||
|
now = 1741899501;
|
||||||
|
in
|
||||||
|
hold now 7 stable unstable;
|
||||||
}
|
}
|
||||||
// (
|
// (
|
||||||
lib.genAttrs [
|
lib.genAttrs [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user