diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-17 12:27:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-17 12:27:34 +0100 |
commit | 815d93dcff66cc6edd60a8f8a6911bf7e18a2e1f (patch) | |
tree | d0d3c5e2614fb8280dc2da51d917712d03c3f6a9 | |
parent | 233c8de4c92c4243f93702f0a0679c68f9bfa23b (diff) | |
parent | 143bb150359ea4ab79e1ecabce2acbdb53f01619 (diff) |
Merge pull request #296470 from NateWright/update-xone
xone: 0.3 -> 0.3-unstable-2024-03-16
-rw-r--r-- | pkgs/os-specific/linux/xone/default.nix | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 104b7952f2be2..b1e2ce570a2d2 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,27 +1,18 @@ { stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.3"; + version = "0.3-unstable-2024-03-16"; src = fetchFromGitHub { owner = "medusalix"; - repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; + repo = "xone"; + rev = "948d2302acdd6333295eaba4da06d96677290ad3"; + 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 = '' - export sourceRoot=$(pwd)/${src.name} + export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -30,7 +21,7 @@ stdenv.mkDerivation rec { "-C" "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "M=$(sourceRoot)" - "VERSION=${version}" + "VERSION=${finalAttrs.version}" ]; buildFlags = [ "modules" ]; @@ -45,4 +36,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - +) |