diff options
author | Jan Malakhovski <oxij@oxij.org> | 2023-07-25 13:27:31 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2023-08-03 16:32:03 +0000 |
commit | 5852f26bdcdca4a33b37d1631cfb3897bcc36fcc (patch) | |
tree | 84541d3de93f39e98f7fabc53094498c6defbc74 /pkgs/os-specific | |
parent | 9aabdcf43f70b18bdebc39d7796c984672603d3e (diff) |
treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 1: trivial cases
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/darwin/libtapi/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/akvcam/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/aseq2json/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/fwts/module.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/gasket/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/gt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/kvmfr/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lenovo-legion/app.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/lenovo-legion/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ultrablue-server/default.nix | 4 | ||||
-rw-r--r-- | pkgs/os-specific/linux/unstick/default.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/wiringpi/default.nix | 2 |
14 files changed, 19 insertions, 19 deletions
diff --git a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix index 3c3dcb6d5d67a..b6dab0d8bdfc5 100644 --- a/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix +++ b/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = freebsd.ports; - sourceRoot = "source/devel/evdev-proto"; + sourceRoot = "${freebsd.ports.name}/devel/evdev-proto"; useTempPrefix = true; diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 79c159e0635c9..351708216ee28 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libtapi"; version = "1100.0.11"; # determined by looking at VERSION.txt @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr"; }; - sourceRoot = "source/src/llvm"; + sourceRoot = "${src.name}/src/llvm"; # Backported from newer llvm, fixes configure error when cross compiling. # Also means we don't have to manually fix the result with install_name_tool. diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index 6d916e0ff7fc2..f2ea933bd5c52 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1f0vjia2d7zj3y5c63lx1r537bdjx6821yxy29ilbrvsbjq2szj8"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ diff --git a/pkgs/os-specific/linux/aseq2json/default.nix b/pkgs/os-specific/linux/aseq2json/default.nix index 646e9f7b7b914..81feb40eb9898 100644 --- a/pkgs/os-specific/linux/aseq2json/default.nix +++ b/pkgs/os-specific/linux/aseq2json/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkg-config, alsa-lib, glib, json-glib }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "aseq2json"; version = "unstable-2018-04-28"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a"; sha256 = "LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA="; }; - sourceRoot = "source/aseq2json"; + sourceRoot = "${src.name}/aseq2json"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib glib json-glib ]; diff --git a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix index 7e0fb379107d2..d1ab4fd55b396 100644 --- a/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix +++ b/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix @@ -11,7 +11,7 @@ , ipuVersion ? "ipu6" }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "${ipuVersion}-camera-bin"; version = "unstable-2023-02-08"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { hash = "sha256-QnedM2UBbGyd2wIF762Mi+VkDZYtC6MifK4XGGxlUzw="; }; - sourceRoot = "source/${ipuVersion}"; + sourceRoot = "${src.name}/${ipuVersion}"; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix index 72f25aa800eb5..a4083d275465a 100644 --- a/pkgs/os-specific/linux/fwts/module.nix +++ b/pkgs/os-specific/linux/fwts/module.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { inherit (fwts) src; - sourceRoot = "source/efi_runtime"; + sourceRoot = "${src.name}/efi_runtime"; postPatch = '' substituteInPlace Makefile --replace \ diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index 1f9d60ad7b606..c0790ae6a278b 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/gt/default.nix b/pkgs/os-specific/linux/gt/default.nix index e227b6b6bc917..72fe277ca9c47 100644 --- a/pkgs/os-specific/linux/gt/default.nix +++ b/pkgs/os-specific/linux/gt/default.nix @@ -2,7 +2,7 @@ , asciidoc , libusbgx }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gt"; version = "unstable-2022-05-08"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "sha256-km4U+t4Id2AZx6GpH24p2WNmvV5RVjJ14sy8tWLCQsk="; }; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix index 67d4d8af2eb80..a77d1290ca803 100644 --- a/pkgs/os-specific/linux/kvmfr/default.nix +++ b/pkgs/os-specific/linux/kvmfr/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = looking-glass-client.version; src = looking-glass-client.src; - sourceRoot = "source/module"; + sourceRoot = "${looking-glass-client.src.name}/module"; patches = lib.optional (kernel.kernelAtLeast "6.4") [ ./linux-6-4-compat.patch ]; diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix index ba189767bca6d..4f4c3c9372542 100644 --- a/pkgs/os-specific/linux/lenovo-legion/app.nix +++ b/pkgs/os-specific/linux/lenovo-legion/app.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-s4JFFmawokdC4qoqNvZDhuJSinhQ3YKSIfAYi79VTTA="; }; - sourceRoot = "source/python/legion_linux"; + sourceRoot = "${src.name}/python/legion_linux"; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix index 375b835ac47db..527f1852f1e08 100644 --- a/pkgs/os-specific/linux/lenovo-legion/default.nix +++ b/pkgs/os-specific/linux/lenovo-legion/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "lenovo-legion-module"; inherit (lenovo-legion) version src; - sourceRoot = "source/kernel_module"; + sourceRoot = "${lenovo-legion.src.name}/kernel_module"; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/ultrablue-server/default.nix b/pkgs/os-specific/linux/ultrablue-server/default.nix index 74a7fe9cfbcd7..620189af361d5 100644 --- a/pkgs/os-specific/linux/ultrablue-server/default.nix +++ b/pkgs/os-specific/linux/ultrablue-server/default.nix @@ -3,7 +3,7 @@ , buildGoModule }: -buildGoModule { +buildGoModule rec { pname = "ultrablue-server"; version = "unstable-fosdem2023"; @@ -16,7 +16,7 @@ buildGoModule { # rev = "6de04af6e353e38c030539c5678e5918f64be37e"; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; vendorSha256 = "sha256-249LWguTHIF0HNIo8CsE/HWpAtBw4P46VPvlTARLTpw="; doCheck = false; diff --git a/pkgs/os-specific/linux/unstick/default.nix b/pkgs/os-specific/linux/unstick/default.nix index 7856456a3c361..ee82679de4ea3 100644 --- a/pkgs/os-specific/linux/unstick/default.nix +++ b/pkgs/os-specific/linux/unstick/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "08la3jmmzlf4pm48bf9zx4cqj9gbqalpqy0s57bh5vfsdk74nnhv"; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ libseccomp ]; diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix index eed71188eb075..e2412b37aab5c 100644 --- a/pkgs/os-specific/linux/wiringpi/default.nix +++ b/pkgs/os-specific/linux/wiringpi/default.nix @@ -18,7 +18,7 @@ let }: stdenv.mkDerivation rec { pname = "wiringpi-${subprj}"; inherit version src; - sourceRoot = "source/${subprj}"; + sourceRoot = "${src.name}/${subprj}"; inherit buildInputs; # Remove (meant for other OSs) lines from Makefiles preInstall = '' |