summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2023-08-26 14:34:50 +0000
committerJan Malakhovski <oxij@oxij.org>2023-08-26 14:34:50 +0000
commit9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6 (patch)
tree139c80f052ef5ba8981b36823dd3e59a2d4d9f92
parent4cdbb53d13d08b544a7928e55c1c76308e3ca3f1 (diff)
downloadnixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar.gz
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar.bz2
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar.lz
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar.xz
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.tar.zst
nixpkgs-9d33433ed2a69c523aa7bbb7ba9f3fc193e525b6.zip
linuxPackages.{xpadneo, xone}: fix after simplifying sourceRoot
This partially reverts commits 68be474e30887a66e0530edfc898b74fb5dd5d26
and 5a0f953d9ffe5c40df263ccccffa647a86729f5a.
-rw-r--r--pkgs/os-specific/linux/xone/default.nix4
-rw-r--r--pkgs/os-specific/linux/xpadneo/default.nix4
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 c46563a36c6..104b7952f2b 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 046b8ef1b25..e470fa66adf 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 ];