Unverified Commit e752b732 authored by Kira Bruneau's avatar Kira Bruneau Committed by GitHub
Browse files

linuxPackages.xpadneo: 0.9.6 -> 0.9.7 (#367667)

parents b409f990 e09f075b

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

+3 −5
Original line number Diff line number Diff line
@@ -10,21 +10,19 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "xpadneo";

  version = "0.9.6";

  version = "0.9.7";



  src = fetchFromGitHub {

    owner = "atar-axis";

    repo = "xpadneo";

    rev = "refs/tags/v${finalAttrs.version}";

    sha256 = "sha256-pX9zpAGnhDLKUAKOQ5iqtK8cKEkjCqDa5v3MwYViWX4=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-evmjQrQPHe8F+6w12bnUv6P4QKGkm63cmP1HEv6equw=";

  };



  setSourceRoot = ''

    export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src

  '';



  patches = [ ./xpadneo-0.9.6-kernel-6.12.patch ];



  nativeBuildInputs = kernel.moduleBuildDependencies;

  buildInputs = [ bluez ];

pkgs/os-specific/linux/xpadneo/xpadneo-0.9.6-kernel-6.12.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
--- a/hid-xpadneo.c

+++ b/hid-xpadneo.c

@@ -713,5 +713,9 @@

 }

 

+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,12,0)

 static u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)

+#else

+static const u8 *xpadneo_report_fixup(struct hid_device *hdev, u8 *rdesc, unsigned int *rsize)

+#endif

 {

 	struct xpadneo_devdata *xdata = hid_get_drvdata(hdev);

--- a/xpadneo.h

+++ b/xpadneo.h

@@ -13,4 +13,5 @@

 

 #include <linux/hid.h>

+#include <linux/version.h>

 

 #include "hid-ids.h"