diff --git a/flake.lock b/flake.lock index 4aa0366d..0d0ece01 100644 --- a/flake.lock +++ b/flake.lock @@ -777,6 +777,22 @@ "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": { "locked": { "lastModified": 1730741070, @@ -1029,6 +1045,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-ollama": "nixpkgs-ollama", + "nixpkgs-patched": "nixpkgs-patched", "nixpkgs-stable": "nixpkgs-stable_3", "nixpkgs-unstable": "nixpkgs-unstable", "nuenv": "nuenv", diff --git a/flake.nix b/flake.nix index 45dfd462..9a72286b 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,8 @@ nixpkgs-ollama.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; + # for macos # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/hardening/nixpaks/default.nix b/hardening/nixpaks/default.nix index d14e4120..409814ec 100644 --- a/hardening/nixpaks/default.nix +++ b/hardening/nixpaks/default.nix @@ -1,5 +1,6 @@ { pkgs, + pkgs-patched, nixpak, ... }: @@ -21,7 +22,7 @@ in nixpkgs.overlays = [ (_: super: { nixpaks = { - qq = wrapper super ./qq.nix; + qq = wrapper pkgs-patched ./qq.nix; qq-desktop-item = super.callPackage ./qq-desktop-item.nix { }; wechat = wrapper super ./wechat.nix; diff --git a/hardening/nixpaks/qq.nix b/hardening/nixpaks/qq.nix index bace0548..8ca91cfc 100644 --- a/hardening/nixpaks/qq.nix +++ b/hardening/nixpaks/qq.nix @@ -14,10 +14,7 @@ mkNixPak { { sloth, ... }: { app = { - package = pkgs.qq.override { - # fix fcitx5 input method - commandLineArgs = lib.concatStringsSep " " [ "--enable-wayland-ime" ]; - }; + package = pkgs.qq; binPath = "bin/qq"; }; flatpak.appId = "com.tencent.qq"; diff --git a/outputs/default.nix b/outputs/default.nix index 3ad1f340..9afea3b5 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -28,6 +28,11 @@ let # To use chrome, we need to allow the installation of non-free software 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 { system = "x86_64-linux";