Ryan Yin
2025-09-01 14:28:06 +08:00
parent 8d7b622430
commit a1d51ffe0c
5 changed files with 27 additions and 5 deletions

17
flake.lock generated
View File

@@ -777,6 +777,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-patched": {
"locked": {
"lastModified": 1756707443,
"narHash": "sha256-1PZ8MF+VoG8jRrUF6+s5nArlytsGrOq54Tz5NAi2oM0=",
"owner": "ryan4yin",
"repo": "nixpkgs",
"rev": "361887dbb55312dd449193578200beedb6688fcf",
"type": "github"
},
"original": {
"owner": "ryan4yin",
"ref": "nixos-unstable-patched",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1730741070, "lastModified": 1730741070,
@@ -1029,6 +1045,7 @@
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-ollama": "nixpkgs-ollama", "nixpkgs-ollama": "nixpkgs-ollama",
"nixpkgs-patched": "nixpkgs-patched",
"nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-stable": "nixpkgs-stable_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nuenv": "nuenv", "nuenv": "nuenv",

View File

@@ -41,6 +41,8 @@
nixpkgs-ollama.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-ollama.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched";
# for macos # for macos
# nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable";

View File

@@ -1,5 +1,6 @@
{ {
pkgs, pkgs,
pkgs-patched,
nixpak, nixpak,
... ...
}: }:
@@ -21,7 +22,7 @@ in
nixpkgs.overlays = [ nixpkgs.overlays = [
(_: super: { (_: super: {
nixpaks = { nixpaks = {
qq = wrapper super ./qq.nix; qq = wrapper pkgs-patched ./qq.nix;
qq-desktop-item = super.callPackage ./qq-desktop-item.nix { }; qq-desktop-item = super.callPackage ./qq-desktop-item.nix { };
wechat = wrapper super ./wechat.nix; wechat = wrapper super ./wechat.nix;

View File

@@ -14,10 +14,7 @@ mkNixPak {
{ sloth, ... }: { sloth, ... }:
{ {
app = { app = {
package = pkgs.qq.override { package = pkgs.qq;
# fix fcitx5 input method
commandLineArgs = lib.concatStringsSep " " [ "--enable-wayland-ime" ];
};
binPath = "bin/qq"; binPath = "bin/qq";
}; };
flatpak.appId = "com.tencent.qq"; flatpak.appId = "com.tencent.qq";

View File

@@ -28,6 +28,11 @@ let
# To use chrome, we need to allow the installation of non-free software # To use chrome, we need to allow the installation of non-free software
config.allowUnfree = true; config.allowUnfree = true;
}; };
pkgs-patched = import inputs.nixpkgs-patched {
inherit system;
# To use chrome, we need to allow the installation of non-free software
config.allowUnfree = true;
};
pkgs-x64 = import nixpkgs { pkgs-x64 = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";