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/applications/misc | |
parent | 9aabdcf43f70b18bdebc39d7796c984672603d3e (diff) | |
download | nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.gz nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.bz2 nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.lz nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.xz nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.zst nixpkgs-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.zip |
treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 1: trivial cases
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/candle/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/openbangla-keyboard/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/pot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/qsudo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/spacenav-cube-example/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/misc/subsurface/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/yubioath-flutter/helper.nix | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 8df75b0cbd1..3f9f2ec678b 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix index 45e9c381c7c..4ce864bfdeb 100644 --- a/pkgs/applications/misc/openbangla-keyboard/default.nix +++ b/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { postPatch = '' cp ${./Cargo.lock} Cargo.lock ''; - sourceRoot = "source/${cargoRoot}"; + sourceRoot = "${src.name}/${cargoRoot}"; sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34="; }; diff --git a/pkgs/applications/misc/pot/default.nix b/pkgs/applications/misc/pot/default.nix index 04570fa2d7c..941796315c7 100644 --- a/pkgs/applications/misc/pot/default.nix +++ b/pkgs/applications/misc/pot/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg="; }; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ diff --git a/pkgs/applications/misc/qsudo/default.nix b/pkgs/applications/misc/qsudo/default.nix index 5f9958f2d5d..d73c3793871 100644 --- a/pkgs/applications/misc/qsudo/default.nix +++ b/pkgs/applications/misc/qsudo/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "06kg057vwkvafnk69m9rar4wih3vq4h36wbzwbfc2kndsnn47lfl"; }; - sourceRoot = "source/src-qt5"; + sourceRoot = "${src.name}/src-qt5"; nativeBuildInputs = [ qmake diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 990aedbc71e..0073c4a0f81 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -2,11 +2,9 @@ stdenv.mkDerivation { pname = "spacenav-cube-example"; - version = libspnav.version; + inherit (libspnav) version src; - src = libspnav.src; - - sourceRoot = "source/examples/cube"; + sourceRoot = "${libspnav.src.name}/examples/cube"; buildInputs = [ libX11 mesa_glu libspnav ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 1bc2c2b6c97..6831cea6c4f 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -44,7 +44,7 @@ let src = subsurfaceSrc; - sourceRoot = "source/libdivecomputer"; + sourceRoot = "${subsurfaceSrc.name}/libdivecomputer"; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 2c188d833af..e40f6a78c86 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -16,7 +16,7 @@ buildPythonApplication { pname = "yubioath-flutter-helper"; inherit src version meta; - sourceRoot = "source/helper"; + sourceRoot = "${src.name}/helper"; format = "pyproject"; postPatch = '' |