diff options
author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-11 16:50:57 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-11 16:50:57 +0100 |
commit | 54c52cb2762de4f2c204657c8903b81d82be5f60 (patch) | |
tree | 27ccdca36bad9aa9774d0866e8d287eb93adab08 /pkgs/by-name | |
parent | 9336998b519fa62fa13ec0e2c770ff0178d6c3d6 (diff) | |
parent | 91b3db13093b1aecdba07041eb44b7103c235d94 (diff) |
Merge pull request #294334 from ShamrockLee/sourceroot-fix
treewide: fix hard-coded `sourceRoot` prefix for `fetchgit`-based `src`
Diffstat (limited to 'pkgs/by-name')
-rw-r--r-- | pkgs/by-name/c2/c2fmzq/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/fr/frankenphp/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/in/intiface-central/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/la/lanzaboote-tool/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/li/liana/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/li/linien-gui/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/me/mercure/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/mo/monophony/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/ru/rustdesk-flutter/package.nix | 4 | ||||
-rw-r--r-- | pkgs/by-name/sn/snippetexpanderx/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/sv/svix-server/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/sy/syn2mas/package.nix | 2 | ||||
-rw-r--r-- | pkgs/by-name/to/torrentstream/package.nix | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index 42069150d468f..1efd3dd52ca21 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - sourceRoot = "source/c2FmZQ"; + sourceRoot = "${src.name}/c2FmZQ"; vendorHash = "sha256-cTXSFwWGHV2QJM4mX/Z+ZxCXKwr+59lEPvJa/PTA1wU="; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 423a1dd1f2e55..90d10fc87f40f 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -35,7 +35,7 @@ in buildGoModule rec { hash = "sha256-tQ35GZuw7Ag1YfmOUarVY45yk4yugNLJetEV4m2w3GE="; }; - sourceRoot = "source/caddy"; + sourceRoot = "${src.name}/caddy"; # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 889ef7a874d01..180d4feefc669 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -27,7 +27,7 @@ flutter.buildFlutterApplication rec { cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}-cargo-deps"; inherit src; - sourceRoot = "source/intiface-engine-flutter-bridge"; + sourceRoot = "${src.name}/intiface-engine-flutter-bridge"; hash = "sha256-0sCHa3rMaLYaUG3E3fmsLi0dSdb9vGyv7qNR3JQkXuU="; }; cargoRoot = "intiface-engine-flutter-bridge"; diff --git a/pkgs/by-name/la/lanzaboote-tool/package.nix b/pkgs/by-name/la/lanzaboote-tool/package.nix index 919ab7d68f2ce..05ea3e4391eb7 100644 --- a/pkgs/by-name/la/lanzaboote-tool/package.nix +++ b/pkgs/by-name/la/lanzaboote-tool/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-Fb5TeRTdvUlo/5Yi2d+FC8a6KoRLk2h1VE0/peMhWPs="; }; - sourceRoot = "source/rust/tool"; + sourceRoot = "${src.name}/rust/tool"; cargoHash = "sha256-g4WzqfH6DZVUuNb0jV3MFdm3h7zy2bQ6d3agrXesWgc="; env.TEST_SYSTEMD = systemd; diff --git a/pkgs/by-name/li/liana/package.nix b/pkgs/by-name/li/liana/package.nix index 043c35770955e..8082161ce930b 100644 --- a/pkgs/by-name/li/liana/package.nix +++ b/pkgs/by-name/li/liana/package.nix @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { systemd ]; - sourceRoot = "source/gui"; + sourceRoot = "${src.name}/gui"; postInstall = '' install -Dm0644 ./ui/static/logos/liana-app-icon.svg $out/share/icons/hicolor/scalable/apps/liana.svg diff --git a/pkgs/by-name/li/linien-gui/package.nix b/pkgs/by-name/li/linien-gui/package.nix index ba6f6d6b58939..972070afc3aca 100644 --- a/pkgs/by-name/li/linien-gui/package.nix +++ b/pkgs/by-name/li/linien-gui/package.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { inherit (python3.pkgs.linien-common) src version; - sourceRoot = "source/linien-gui"; + sourceRoot = "${src.name}/linien-gui"; nativeBuildInputs = with python3.pkgs; [ setuptools diff --git a/pkgs/by-name/me/mercure/package.nix b/pkgs/by-name/me/mercure/package.nix index f489155b4c250..dc4c67c4362b6 100644 --- a/pkgs/by-name/me/mercure/package.nix +++ b/pkgs/by-name/me/mercure/package.nix @@ -17,7 +17,7 @@ buildGoModule rec { hash = "sha256-4Y+yZSZrBDLPbQXaOCSKk/EY20Ka8CS4ivUg1TEaqXo="; }; - sourceRoot = "source/caddy"; + sourceRoot = "${src.name}/caddy"; vendorHash = "sha256-N0RmvhBlTiWmBb4TzLmaThD9jVkKgcIO9vPWxJAvLRQ="; diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 3a1705cd3b7ba..64b86b2921719 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { version = "2.7.0"; format = "other"; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; src = fetchFromGitLab { owner = "zehkira"; repo = "monophony"; diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix index dc24dad68e471..2c82eade26da5 100644 --- a/pkgs/by-name/ru/rustdesk-flutter/package.nix +++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix @@ -39,7 +39,7 @@ sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary; -in flutter316.buildFlutterApplication { +in flutter316.buildFlutterApplication rec { pname = "rustdesk"; version = "1.2.3-unstable-2024-02-11"; src = fetchFromGitHub { @@ -52,7 +52,7 @@ in flutter316.buildFlutterApplication { strictDeps = true; # Configure the Flutter/Dart build - sourceRoot = "source/flutter"; + sourceRoot = "${src.name}/flutter"; # curl https://raw.githubusercontent.com/rustdesk/rustdesk/16db977fd81e14af62ec5ac7760a7661a5c24be8/flutter/pubspec.lock | yq pubspecLock = lib.importJSON ./pubspec.lock.json; gitHashes = { diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 3c91adbbbc0c8..bb7ad94f51c9f 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "snippetexpanderx"; - sourceRoot = "source/cmd/snippetexpanderx"; + sourceRoot = "${src.name}/cmd/snippetexpanderx"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/sv/svix-server/package.nix b/pkgs/by-name/sv/svix-server/package.nix index e7de972488e2e..7ccdf1f6b3f22 100644 --- a/pkgs/by-name/sv/svix-server/package.nix +++ b/pkgs/by-name/sv/svix-server/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-6758ej7bTvwZPWifl239rQMazM8uw+Y4+3EbjE8XsTg="; }; - sourceRoot = "source/server"; + sourceRoot = "${src.name}/server"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/by-name/sy/syn2mas/package.nix b/pkgs/by-name/sy/syn2mas/package.nix index 6a147a2d647ea..75fefef936896 100644 --- a/pkgs/by-name/sy/syn2mas/package.nix +++ b/pkgs/by-name/sy/syn2mas/package.nix @@ -14,7 +14,7 @@ buildNpmPackage rec { hash = "sha256-DPGigs6DifTRa7VQVHgizZ3BUy3FPX3YhZi++yoBFBA="; }; - sourceRoot = "source/tools/syn2mas"; + sourceRoot = "${src.name}/tools/syn2mas"; npmDepsHash = "sha256-HvBFuRyP1APg5V+yhvlODAJ02MEkdpuLfNjWB/UT2vg="; diff --git a/pkgs/by-name/to/torrentstream/package.nix b/pkgs/by-name/to/torrentstream/package.nix index 44a92c7d850a0..b59c17dd59c67 100644 --- a/pkgs/by-name/to/torrentstream/package.nix +++ b/pkgs/by-name/to/torrentstream/package.nix @@ -16,7 +16,7 @@ buildDotnetModule rec { hash = "sha256-41zlzrQ+YGY2wEvq4Su/lp6lOmGW4u0F37ub2a3z+7o="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; projectFile = "TorrentStream.sln"; nugetDeps = ./deps.nix; |