Merge pull request #296470 from NateWright/update-xone

xone: 0.3 -> 0.3-unstable-2024-03-16
This commit is contained in:
Pol Dellaiera 2024-03-17 12:27:34 +01:00 committed by GitHub
commit 815d93dcff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,27 +1,18 @@
{ stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }: { stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "xone"; pname = "xone";
version = "0.3"; version = "0.3-unstable-2024-03-16";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "medusalix"; owner = "medusalix";
repo = pname; repo = "xone";
rev = "refs/tags/v${version}"; rev = "948d2302acdd6333295eaba4da06d96677290ad3";
sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM=";
}; };
patches = [
# Fix build on kernel 6.3
(fetchpatch {
name = "kernel-6.3.patch";
url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch";
hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU=";
})
];
setSourceRoot = '' setSourceRoot = ''
export sourceRoot=$(pwd)/${src.name} export sourceRoot=$(pwd)/${finalAttrs.src.name}
''; '';
nativeBuildInputs = kernel.moduleBuildDependencies; nativeBuildInputs = kernel.moduleBuildDependencies;
@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
"-C" "-C"
"${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"M=$(sourceRoot)" "M=$(sourceRoot)"
"VERSION=${version}" "VERSION=${finalAttrs.version}"
]; ];
buildFlags = [ "modules" ]; buildFlags = [ "modules" ];
@ -45,4 +36,4 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }
)