lol

treewide: fix some more `sourceRoot`s

This change is almost a noop.

+27 -27
+3 -3
pkgs/by-name/ca/cargo-llvm-cov/package.nix
··· 45 }; 46 in 47 48 - rustPlatform.buildRustPackage { 49 inherit pname version; 50 51 # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not ··· 59 60 # Upstream doesn't include the lockfile so we need to add it back 61 postUnpack = '' 62 - cp ${cargoLock} source/Cargo.lock 63 ''; 64 65 useFetchCargoVendor = true; ··· 103 # The profiler runtime is (currently) disabled on non-Linux platforms 104 broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); 105 }; 106 - }
··· 45 }; 46 in 47 48 + rustPlatform.buildRustPackage (finalAttrs: { 49 inherit pname version; 50 51 # Use `fetchFromGitHub` instead of `fetchCrate` because the latter does not ··· 59 60 # Upstream doesn't include the lockfile so we need to add it back 61 postUnpack = '' 62 + cp ${cargoLock} ${finalAttrs.src.name}/Cargo.lock 63 ''; 64 65 useFetchCargoVendor = true; ··· 103 # The profiler runtime is (currently) disabled on non-Linux platforms 104 broken = !(stdenv.hostPlatform.isLinux && !stdenv.targetPlatform.isRedox); 105 }; 106 + })
+2 -2
pkgs/by-name/fi/firmware-updater/package.nix
··· 5 fetchFromGitHub, 6 }: 7 8 - flutter.buildFlutterApplication { 9 pname = "firmware-updater"; 10 version = "0-unstable-2024-20-11"; 11 12 pubspecLock = lib.importJSON ./pubspec.lock.json; 13 14 - sourceRoot = "./source/apps/firmware_updater"; 15 16 gitHashes = { 17 fwupd = "sha256-l/+HrrJk1mE2Mrau+NmoQ7bu9qhHU6wX68+m++9Hjd4=";
··· 5 fetchFromGitHub, 6 }: 7 8 + flutter.buildFlutterApplication rec { 9 pname = "firmware-updater"; 10 version = "0-unstable-2024-20-11"; 11 12 pubspecLock = lib.importJSON ./pubspec.lock.json; 13 14 + sourceRoot = "${src.name}/apps/firmware_updater"; 15 16 gitHashes = { 17 fwupd = "sha256-l/+HrrJk1mE2Mrau+NmoQ7bu9qhHU6wX68+m++9Hjd4=";
+1 -1
pkgs/by-name/ka/kata-runtime/package.nix
··· 37 hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; 38 }; 39 40 - sourceRoot = "source/src/runtime"; 41 42 vendorHash = null; 43
··· 37 hash = "sha256-Ir+/ZZJHm6E+044wczU3UvL+Py9Wprgw2QKJaYyDrKU="; 38 }; 39 40 + sourceRoot = "${src.name}/src/runtime"; 41 42 vendorHash = null; 43
+1 -1
pkgs/by-name/ni/nitrokey-start-firmware/package.nix
··· 17 fetchSubmodules = true; 18 }; 19 20 - sourceRoot = "source/src"; 21 22 postPatch = '' 23 patchShebangs configure
··· 17 fetchSubmodules = true; 18 }; 19 20 + sourceRoot = "${finalAttrs.src.name}/src"; 21 22 postPatch = '' 23 patchShebangs configure
+1 -1
pkgs/by-name/ni/nitrokey-storage-firmware/package.nix
··· 50 stdenv.mkDerivation { 51 inherit pname version src; 52 53 - sourceRoot = "source/src"; 54 55 postPatch = '' 56 substituteInPlace Makefile \
··· 50 stdenv.mkDerivation { 51 inherit pname version src; 52 53 + sourceRoot = "${src.name}/src"; 54 55 postPatch = '' 56 substituteInPlace Makefile \
+1 -1
pkgs/by-name/ni/nitrokey-trng-rs232-firmware/package.nix
··· 18 19 nativeBuildInputs = [ pkgsCross.avr.stdenv.cc ]; 20 21 - sourceRoot = "source/src"; 22 23 makeFlags = [ "all" ]; 24
··· 18 19 nativeBuildInputs = [ pkgsCross.avr.stdenv.cc ]; 20 21 + sourceRoot = "${finalAttrs.src.name}/src"; 22 23 makeFlags = [ "all" ]; 24
+1 -1
pkgs/by-name/ps/ps3netsrv/package.nix
··· 18 hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; 19 }; 20 21 - sourceRoot = "./source/${pname}"; 22 23 buildInputs = [ 24 meson
··· 18 hash = "sha256-ynFuCD+tp8E/DDdB/HU9BCmwKcmQy6NBx26MKnP4W0o="; 19 }; 20 21 + sourceRoot = "${src.name}/${pname}"; 22 23 buildInputs = [ 24 meson
+1 -1
pkgs/by-name/vp/vpp/package.nix
··· 71 patchShebangs ../vpp-api/ 72 ''; 73 74 - sourceRoot = "source/src"; 75 76 enableParallelBuilding = true; 77 env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized";
··· 71 patchShebangs ../vpp-api/ 72 ''; 73 74 + sourceRoot = "${src.name}/src"; 75 76 enableParallelBuilding = true; 77 env.NIX_CFLAGS_COMPILE = "-Wno-error -Wno-array-bounds -Wno-maybe-uninitialized";
+1 -1
pkgs/by-name/xa/xar/package.nix
··· 56 57 # We do not use or modify files outside of the xar subdirectory. 58 patchFlags = [ "-p2" ]; 59 - sourceRoot = "source/xar"; 60 61 outputs = [ 62 "out"
··· 56 57 # We do not use or modify files outside of the xar subdirectory. 58 patchFlags = [ "-p2" ]; 59 + sourceRoot = "${finalAttrs.src.name}/xar"; 60 61 outputs = [ 62 "out"
+1 -1
pkgs/development/coq-modules/Vpl/default.nix
··· 14 15 release."0.5".sha256 = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o="; 16 17 - sourceRoot = "source/coq"; 18 19 meta = { 20 description = "Coq interface to VPL abstract domain of convex polyhedra";
··· 14 15 release."0.5".sha256 = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o="; 16 17 + setSourceRoot = "sourceRoot=$(echo */coq)"; 18 19 meta = { 20 description = "Coq interface to VPL abstract domain of convex polyhedra";
+2 -2
pkgs/development/libraries/pipewire/default.nix
··· 216 doCheck = true; 217 218 postUnpack = '' 219 - patchShebangs source/doc/*.py 220 - patchShebangs source/doc/input-filter-h.sh 221 ''; 222 223 postInstall = ''
··· 216 doCheck = true; 217 218 postUnpack = '' 219 + patchShebangs ${finalAttrs.src.name}/doc/*.py 220 + patchShebangs ${finalAttrs.src.name}/doc/input-filter-h.sh 221 ''; 222 223 postInstall = ''
+1 -1
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
··· 67 pname = "indi-3rdparty-${pname}"; 68 inherit src version; 69 70 - sourceRoot = "source/${pname}"; 71 72 cmakeFlags = 73 [
··· 67 pname = "indi-3rdparty-${pname}"; 68 inherit src version; 69 70 + sourceRoot = "${src.name}/${pname}"; 71 72 cmakeFlags = 73 [
+1 -1
pkgs/development/python-modules/biliass/default.nix
··· 20 hash = "sha256-IrzFjjMNuD5UgdccHxIxZoeZpM1PGtVQRTWHOocnmAU="; 21 }; 22 23 - sourceRoot = "source/packages/biliass"; 24 cargoRoot = "rust"; 25 26 cargoDeps = rustPlatform.fetchCargoVendor {
··· 20 hash = "sha256-IrzFjjMNuD5UgdccHxIxZoeZpM1PGtVQRTWHOocnmAU="; 21 }; 22 23 + sourceRoot = "${src.name}/packages/biliass"; 24 cargoRoot = "rust"; 25 26 cargoDeps = rustPlatform.fetchCargoVendor {
+1 -1
pkgs/development/python-modules/polars/default.nix
··· 177 178 requiredSystemFeatures = [ "big-parallel" ]; 179 180 - sourceRoot = "source/py-polars"; 181 postPatch = '' 182 for f in * ; do 183 [[ "$f" == "tests" ]] || \
··· 177 178 requiredSystemFeatures = [ "big-parallel" ]; 179 180 + sourceRoot = "${src.name}/py-polars"; 181 postPatch = '' 182 for f in * ; do 183 [[ "$f" == "tests" ]] || \
+1 -1
pkgs/development/tools/analysis/rr/zen_workaround.nix
··· 14 pname = "rr-zen_workaround"; 15 16 inherit (rr) src version; 17 - sourceRoot = "source/third-party/zen-pmu-workaround"; 18 19 hardeningDisable = [ "pic" ]; 20 nativeBuildInputs = kernel.moduleBuildDependencies;
··· 14 pname = "rr-zen_workaround"; 15 16 inherit (rr) src version; 17 + sourceRoot = "${rr.src.name}/third-party/zen-pmu-workaround"; 18 19 hardeningDisable = [ "pic" ]; 20 nativeBuildInputs = kernel.moduleBuildDependencies;
+1 -1
pkgs/kde/third-party/koi/default.nix
··· 20 }; 21 22 # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix 23 - sourceRoot = "source/src"; 24 nativeBuildInputs = [ 25 cmake 26 wrapQtAppsHook
··· 20 }; 21 22 # See https://github.com/baduhai/Koi/blob/master/development/Nix%20OS/dev.nix 23 + sourceRoot = "${src.name}/src"; 24 nativeBuildInputs = [ 25 cmake 26 wrapQtAppsHook
+1 -1
pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
··· 21 baseAttrs = finalAttrs: { 22 releaseName = "ICU"; 23 24 - sourceRoot = "source/icu/icu4c/source"; 25 26 patches = [ 27 # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does.
··· 21 baseAttrs = finalAttrs: { 22 releaseName = "ICU"; 23 24 + sourceRoot = "${finalAttrs.src.name}/icu/icu4c/source"; 25 26 patches = [ 27 # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does.
+3 -3
pkgs/os-specific/darwin/apple-source-releases/locale/package.nix
··· 6 stdenvNoCC, 7 }: 8 9 - stdenvNoCC.mkDerivation { 10 pname = "locale"; 11 version = "118"; 12 ··· 20 hash = "sha256-KzaAlqXqfJW2s31qmA0D7qteaZY57Va2o86aZrwyR74="; 21 }; 22 23 - sourceRoot = "source/usr-share-locale.tproj"; 24 25 postPatch = '' 26 # bmake expects `Makefile` not `BSDmakefile`. ··· 60 ]; 61 maintainers = lib.teams.darwin.members; 62 }; 63 - }
··· 6 stdenvNoCC, 7 }: 8 9 + stdenvNoCC.mkDerivation (finalAttrs: { 10 pname = "locale"; 11 version = "118"; 12 ··· 20 hash = "sha256-KzaAlqXqfJW2s31qmA0D7qteaZY57Va2o86aZrwyR74="; 21 }; 22 23 + sourceRoot = "${finalAttrs.src.name}/usr-share-locale.tproj"; 24 25 postPatch = '' 26 # bmake expects `Makefile` not `BSDmakefile`. ··· 60 ]; 61 maintainers = lib.teams.darwin.members; 62 }; 63 + })
+2 -2
pkgs/tools/networking/curl-impersonate/chrome/default.nix
··· 95 96 postUnpack = 97 lib.concatStringsSep "\n" ( 98 - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( 99 lib.filterAttrs (n: v: v ? outPath) passthru.deps 100 ) 101 ) 102 + '' 103 104 - curltar=$(realpath -s source/curl-*.tar.gz) 105 106 pushd "$(mktemp -d)" 107
··· 95 96 postUnpack = 97 lib.concatStringsSep "\n" ( 98 + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( 99 lib.filterAttrs (n: v: v ? outPath) passthru.deps 100 ) 101 ) 102 + '' 103 104 + curltar=$(realpath -s ${src.name}/curl-*.tar.gz) 105 106 pushd "$(mktemp -d)" 107
+1 -1
pkgs/tools/networking/curl-impersonate/firefox/default.nix
··· 104 dontUseNinjaCheck = true; 105 106 postUnpack = lib.concatStringsSep "\n" ( 107 - lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} source/${name}") ( 108 lib.filterAttrs (n: v: v ? outPath) passthru.deps 109 ) 110 );
··· 104 dontUseNinjaCheck = true; 105 106 postUnpack = lib.concatStringsSep "\n" ( 107 + lib.mapAttrsToList (name: dep: "ln -sT ${dep.outPath} ${src.name}/${name}") ( 108 lib.filterAttrs (n: v: v ? outPath) passthru.deps 109 ) 110 );