Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

heroic: fix cursor issues #358010

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Steinhagen
Copy link
Contributor

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:
  • 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.

Fix the Xorg mouse issues initialy found with Lutris in:
NixOS#348533
Copy link
Contributor

@aidalgol aidalgol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member

Atemu commented Nov 22, 2024

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
Copy link
Contributor Author

Steinhagen commented Nov 22, 2024

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
            ];
          })
        ]);
    };
  };
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants