heroic: fix cursor issues

[Steinhagen]

Fix the Xorg mouse issues initialy found with Lutris in: #348533

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[aidalgol]

I don't think I have any way of testing this, but adding these Xorg packages to the FHS environment seems perfectly sensible to me.

[Atemu]

For testing, please simply point your Nixpkgs at this branch. If you use NIX_PATH then use -I nixpkgs=https://github.com/Steinhagen/nixpkgs/archive/refs/heads/heroic-xorg-mouse-fix.zip and flakes users can use the flake url github:Steinhagen/nixpkgs/heroic-xorg-mouse-fix.

[Steinhagen]

If you are using flakes, another way to test this would be:

============================== flake.nix ===============================

{
  ......................................................................
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
    heroicfix.url = "github:Steinhagen/nixpkgs/heroic-xorg-mouse-fix";
  ......................................................................
  };
  outputs =
    {
      self,
      nixpkgs,
      ...
    }@inputs:
    let
      system = "x86_64-linux";
      pkgs = nixpkgs.legacyPackages."x86_64-linux";
      pkgs-heroicfix = import inputs.heroicfix {
        inherit system;
        config.allowUnfree = true;
      };
    in
    {
      nixosConfigurations = {
        test-machine = nixpkgs.lib.nixosSystem {
          specialArgs = {
            inherit
              system
              inputs
              pkgs-heroicfix
              ;
          ..............................................................
          };
          modules = [
            ./configuration.nix
  ......................................................................

=========================== configuration.nix ==========================

{
  pkgs,
  pkgs-heroicfix,
  ...
}:
{
  ......................................................................
  users.users = {
    demouser = {
      ..................................................................
      packages =
        (with pkgs; [
          ..............................................................
        ])
        ++ (with pkgs-heroicfix; [
          (heroic.override {
            extraPkgs = pkgs-heroicfix: [
              wineWowPackages.staging
              winetricks
              wineWowPackages.waylandFull
            ];
          })
        ]);
    };
  };
}

[Atemu]

nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
heroicfix.url = "github:Steinhagen/nixpkgs/heroic-xorg-mouse-fix";

I'd recommend replacing the nixpkgs input entirely. You should never mix multiple nixpkgs revisions in a single derivation.

[KennethHoff]

nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
heroicfix.url = "github:Steinhagen/nixpkgs/heroic-xorg-mouse-fix";

I'd recommend replacing the nixpkgs input entirely. You should never mix multiple nixpkgs revisions in a single derivation.

What does this mean? Would doing this in a flake.nix do the trick?

- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs.url = "github:Steinhagen/nixpkgs/heroic-xorg-mouse-fix";

[Atemu]

Yup, please test with that and report back.

[KennethHoff]

I realized I was on a relatively old unstable branch so it takes a little while to rebuild. First gonna test if my PC works on the newest unstable and then I can test out @Steinhagen's branch.

Tangent, but how do I set the download-buffer-size setting? My Google-fu is unusually bad at this; I literally get 3 results on Google and even ChatGPT is failing me. It says something about nix.conf (which, for reference, I've never even heard about before now), but I want to set it in my configuration.nix instead 😅

[Atemu]

I realized I was on a relatively old unstable branch so it takes a little while to rebuild. First gonna test if my PC works on the newest unstable and then I can test out @Steinhagen's branch.

Note that this PR is based on master rather than unstable and there's usually a couple of days delay and a lot of things can happen in a few days (i.e. a staging-next merge).

(Handy Nixpkgs contributior trick: Unless there are conflicts, always base your branch on nixos-unstable. Even when targetting staging. This makes your PR much easier to work with in some cases like this one.)

how do I set the download-buffer-size setting

The same way you configure any nix.conf setting: https://search.nixos.org/options?channel=unstable&show=nix.settings&from=0&size=50&sort=relevance&type=packages&query=nix.conf

[KennethHoff]

After like an hour of compiling Firefox for some reason I was able to verify that nixos-unstable w/ Heroic still does not work, but this PR w/ Heroic does work! (I checked Lutris too just for fun, and it still worked)

[Atemu]

Great, thanks :)