From 9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 26 Aug 2023 14:34:50 +0000 Subject: [PATCH] linuxPackages.{xpadneo, xone}: fix after simplifying sourceRoot This partially reverts commits 68be474e30887a66e0530edfc898b74fb5dd5d26 and 5a0f953d9ffe5c40df263ccccffa647a86729f5a. --- pkgs/os-specific/linux/xone/default.nix | 4 +++- pkgs/os-specific/linux/xpadneo/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index c46563a36c6f..104b7952f2be 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { }) ]; - sourceRoot = src.name; + setSourceRoot = '' + export sourceRoot=$(pwd)/${src.name} + ''; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 046b8ef1b254..e470fa66adf3 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-rT2Mq40fE055FemDG7PBjt+cxgIHJG9tTjtw2nW6B98="; }; - sourceRoot = "${finalAttrs.src.name}/hid-xpadneo/src"; + setSourceRoot = '' + export sourceRoot=$(pwd)/${finalAttrs.src.name}/hid-xpadneo/src + ''; nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ bluez ];