commit 043bc8a98432a5610b632b82dac4961be108cd61 · pyrox.dev/nixpkgs

+8

nixos/doc/manual/from_md/release-notes/rl-2111.section.xml

···

       321
       321
        
                 <link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>.

     

       322
       322
        
               </para>

     

       323
       323
        
             </listitem>

     

       324
       324
       +
             <listitem>

     

       325
       325
       +
               <para>

     

       326
       326
       +
                 <link xlink:href="https://github.com/DanielOgorchock/joycond">joycond</link>,

     

       327
       327
       +
                 a service that uses <literal>hid-nintendo</literal> to provide

     

       328
       328
       +
                 nintendo joycond pairing and better nintendo switch pro

     

       329
       329
       +
                 controller support.

     

       330
       330
       +
               </para>

     

       331
       331
       +
             </listitem>

     

       324
       332
        
           </itemizedlist>

     

       325
       333
        
         </section>

     

       326
       334
        
         <section xml:id="sec-release-21.11-incompatibilities">

+2

nixos/doc/manual/release-notes/rl-2111.section.md

···

       99
       99
        
       

     

       100
       100
        
       - [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable).

     

       101
       101
        
       

     

       102
       102
       +
       - [joycond](https://github.com/DanielOgorchock/joycond), a service that uses `hid-nintendo` to provide nintendo joycond pairing and better nintendo switch pro controller support.

     

       103
       103
       +
       

     

       102
       104
        
       ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}

     

       103
       105
        
       

     

       104
       106
        
       - The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set.

+1

nixos/modules/module-list.nix

···

       412
       412
        
         ./services/hardware/illum.nix

     

       413
       413
        
         ./services/hardware/interception-tools.nix

     

       414
       414
        
         ./services/hardware/irqbalance.nix

     

       415
       415
       +
         ./services/hardware/joycond.nix

     

       415
       416
        
         ./services/hardware/lcd.nix

     

       416
       417
        
         ./services/hardware/lirc.nix

     

       417
       418
        
         ./services/hardware/nvidia-optimus.nix

+40

nixos/modules/services/hardware/joycond.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.joycond;

     

       5
       5
       +
         kernelPackages = config.boot.kernelPackages;

     

       6
       6
       +
       in

     

       7
       7
       +
       

     

       8
       8
       +
       with lib;

     

       9
       9
       +
       

     

       10
       10
       +
       {

     

       11
       11
       +
         options.services.joycond = {

     

       12
       12
       +
           enable = mkEnableOption "support for Nintendo Pro Controllers and Joycons";

     

       13
       13
       +
       

     

       14
       14
       +
           package = mkOption {

     

       15
       15
       +
             type = types.package;

     

       16
       16
       +
             default = pkgs.joycond;

     

       17
       17
       +
             defaultText = "pkgs.joycond";

     

       18
       18
       +
             description = ''

     

       19
       19
       +
               The joycond package to use.

     

       20
       20
       +
             '';

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         config = mkIf cfg.enable {

     

       25
       25
       +
           environment.systemPackages = [

     

       26
       26
       +
             kernelPackages.hid-nintendo

     

       27
       27
       +
             cfg.package

     

       28
       28
       +
           ];

     

       29
       29
       +
       

     

       30
       30
       +
           boot.extraModulePackages = [ kernelPackages.hid-nintendo ];

     

       31
       31
       +
           boot.kernelModules = [ "hid_nintendo" ];

     

       32
       32
       +
       

     

       33
       33
       +
           services.udev.packages = [ cfg.package ];

     

       34
       34
       +
       

     

       35
       35
       +
           systemd.packages = [ cfg.package ];

     

       36
       36
       +
       

     

       37
       37
       +
           # Workaround for https://github.com/NixOS/nixpkgs/issues/81138

     

       38
       38
       +
           systemd.services.joycond.wantedBy = [ "multi-user.target" ];

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+7 -4

pkgs/os-specific/linux/joycond/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevdev, udev }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libevdev, udev, acl }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "joycond";

     

       5
       5
       -
         version = "unstable-2021-03-27";

     

       5
       5
       +
         version = "unstable-2021-07-30";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "DanielOgorchock";

     

       9
       9
        
           repo = "joycond";

     

       10
       10
       -
           rev = "2d3f553060291f1bfee2e49fc2ca4a768b289df8";

     

       11
       11
       -
           sha256 = "0dpmwspll9ar3pxg9rgnh224934par8h8bixdz9i2pqqbc3dqib7";

     

       10
       10
       +
           rev = "f9a66914622514c13997c2bf7ec20fa98e9dfc1d";

     

       11
       11
       +
           sha256 = "sha256-quw7yBHDDZk1+6uHthsfMCej7g5uP0nIAqzvI6436B8=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeBuildInputs = [ cmake pkg-config ];

     
···

       25
       25
        
       

     

       26
       26
        
           substituteInPlace $out/etc/systemd/system/joycond.service --replace \

     

       27
       27
        
             "ExecStart=/usr/bin/joycond" "ExecStart=$out/bin/joycond"

     

       28
       28
       +
       

     

       29
       29
       +
           substituteInPlace $out/etc/udev/rules.d/89-joycond.rules --replace \

     

       30
       30
       +
             "/bin/setfacl"  "${acl}/bin/setfacl"

     

       28
       31
        
         '';

     

       29
       32
        
       

     

       30
       33
        
         meta = with lib; {