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 | |
parent | 9aabdcf43f70b18bdebc39d7796c984672603d3e (diff) | |
download | nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.gz nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.bz2 nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.lz nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.xz nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.tar.zst nixlib-5852f26bdcdca4a33b37d1631cfb3897bcc36fcc.zip |
treewide: noop: refer to `src.name` or similar in `sourceRoot` where appropriate, part 1: trivial cases
Diffstat (limited to 'pkgs/applications')
54 files changed, 64 insertions, 66 deletions
diff --git a/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/pkgs/applications/audio/alsa-scarlett-gui/default.nix index fec5cd304476..9740c2f71861 100644 --- a/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 alsa-lib ]; postInstall = '' diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix index 832bd59c4da6..2ff8accecb24 100644 --- a/pkgs/applications/audio/miniaudicle/default.nix +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; - sourceRoot = "source/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' echo '#define GIT_REVISION "${finalAttrs.version}-NixOS"' > git-rev.h diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 5663070d7dfe..01940bfc4f32 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1rasp2v1ds2aw296lbf27rzw0l9fjl0cvbvw85d5ycvh6wkm301p"; }; - sourceRoot = "source/muse3"; + sourceRoot = "${src.name}/muse3"; patches = [ ./fix-parallel-building.patch ]; diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index 8f11ec809c3a..e92319127d7d 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { libjack2 ]; - sourceRoot = "source/picoloop"; + sourceRoot = "${src.name}/picoloop"; makeFlags = [ "-f Makefile.PatternPlayer_debian_RtAudio_sdl20" ]; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index d85367626416..95fe9c5880d1 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -68,7 +68,7 @@ mkDerivation rec { buildInputs = [ taglib ] ++ runtimeDeps; # encoder plugins go to ${out}/lib so they're found by kbuildsycoca5 cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" ]; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; # add runt-time deps to PATH postInstall = '' wrapProgram $out/bin/soundkonverter --prefix PATH : ${lib.makeBinPath runtimeDeps } diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 8bce5c83a691..415bf352cae9 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -12,7 +12,7 @@ let pname = "rnnoise-nu"; version = "unstable-07-10-2019"; src = speech-denoiser-src; - sourceRoot = "source/rnnoise"; + sourceRoot = "${speech-denoiser-src.name}/rnnoise"; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--disable-examples" "--disable-doc" "--disable-shared" "--enable-static" ]; installTargets = [ "install-rnnoise-nu" ]; diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/applications/audio/tagutil/default.nix index e5076188301a..9cd9946be60d 100644 --- a/pkgs/applications/audio/tagutil/default.nix +++ b/pkgs/applications/audio/tagutil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-oY1aGl5CKVtpOfh8Wskio/huWYMiPuxWPqxlooTutcw="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 5e00a016334f..63ecd18e4641 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; postPatch = '' substituteInPlace Misc/Config.cpp --replace /usr $out diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix index 3fa9f1b4f974..a81f5827027f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix @@ -28,7 +28,7 @@ let pname = "tsc"; commit = version; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; recipe = writeText "recipe" '' (tsc @@ -44,7 +44,7 @@ let pname = "tsc-dyn"; nativeBuildInputs = [ rustPlatform.bindgenHook ]; - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; postInstall = '' LIB=($out/lib/libtsc_dyn.*) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py index a144cb77be92..77ef632ded6e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/update.py @@ -96,12 +96,12 @@ if __name__ == "__main__": drv_path = eval_drv( nixpkgs, """ - rustPlatform.buildRustPackage { + rustPlatform.buildRustPackage rec { pname = "tsc-dyn"; version = "%s"; nativeBuildInputs = [ clang ]; src = fetchFromGitHub (lib.importJSON %s); - sourceRoot = "source/core"; + sourceRoot = "${src.name}/core"; cargoHash = lib.fakeHash; } """ diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index 8a58dd24555f..2f03984f3df3 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2, mpfr }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "basiliskii"; version = "unstable-2022-09-30"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; - sourceRoot = "source/BasiliskII/src/Unix"; + sourceRoot = "${src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ SDL2 gtk2 mpfr ]; diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix index 0e82fbfa655b..b4681ab697b2 100644 --- a/pkgs/applications/file-managers/xplorer/default.nix +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -51,7 +51,7 @@ in rustPlatform.buildRustPackage { inherit version src pname; - sourceRoot = "source/src-tauri"; + sourceRoot = "${src.name}/src-tauri"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/pkgs/applications/graphics/djv/default.nix b/pkgs/applications/graphics/djv/default.nix index 250ff2b32efa..8e36e5b70db1 100644 --- a/pkgs/applications/graphics/djv/default.nix +++ b/pkgs/applications/graphics/djv/default.nix @@ -56,7 +56,7 @@ let src = djvSrc; - sourceRoot = "source/etc/SuperBuild"; + sourceRoot = "${src.name}/etc/SuperBuild"; nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index e37539ceeec5..0fa08c31c0a6 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli ''; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; meta = with lib; { description = "Very customizable imageboard/booru downloader with powerful filenaming features"; diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix index 4cb2440cb8ee..905e99a1c231 100644 --- a/pkgs/applications/graphics/pixelnuke/default.nix +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pixelnuke"; version = "unstable-2019-05-19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; }; - sourceRoot = "source/pixelnuke"; + sourceRoot = "${src.name}/pixelnuke"; buildInputs = [ libevent glew glfw ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 52c3fa3bae4e..61fcb3a24bc6 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -39,7 +39,7 @@ let pname = "ETL"; inherit version src; - sourceRoot = "source/ETL"; + sourceRoot = "${src.name}/ETL"; nativeBuildInputs = [ pkg-config @@ -54,7 +54,7 @@ let pname = "synfig"; inherit version src; - sourceRoot = "source/synfig-core"; + sourceRoot = "${src.name}/synfig-core"; configureFlags = [ "--with-boost=${boost.dev}" @@ -89,7 +89,7 @@ stdenv.mkDerivation { pname = "synfigstudio"; inherit version src; - sourceRoot = "source/synfig-studio"; + sourceRoot = "${src.name}/synfig-studio"; postPatch = '' patchShebangs images/splash_screen_development.sh diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index b02d35f93ad9..27957a5fa86f 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot = "src/fuzzy-finder"; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; - sourceRoot = "source/src/fuzzy-finder"; + sourceRoot = "${finalAttrs.src.name}/src/fuzzy-finder"; hash = "sha256-CDKlmwA2Wj78xPaSiYPmIJ7xmiE5Co+oGGejZU3v1zI="; }; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 8df75b0cbd19..3f9f2ec678b5 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 45e9c381c7cf..4ce864bfdeb0 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 04570fa2d7ca..941796315c71 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 5f9958f2d5d6..d73c3793871a 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 990aedbc71ec..0073c4a0f81e 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 1bc2c2b6c976..6831cea6c4f3 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 2c188d833af6..e40f6a78c862 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 = '' diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 225e7a0e8676..ee04f9ed04dc 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { pname = "browsh"; - sourceRoot = "source/interfacer"; + sourceRoot = "${src.name}/interfacer"; src = fetchFromGitHub { owner = "browsh-org"; diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1af17ad7aaaa..cf544b07db28 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -10,7 +10,7 @@ , nixosTests }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ladybird"; version = "unstable-2023-01-17"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { hash = "sha256-n2mLg9wNfdMGsJuGj+ukjto9qYjGOIz4cZjgvMGQUrY="; }; - sourceRoot = "source/Ladybird"; + sourceRoot = "${src.name}/Ladybird"; postPatch = '' substituteInPlace CMakeLists.txt \ diff --git a/pkgs/applications/networking/filebrowser/default.nix b/pkgs/applications/networking/filebrowser/default.nix index 265e8236be69..153cc791cbf9 100644 --- a/pkgs/applications/networking/filebrowser/default.nix +++ b/pkgs/applications/networking/filebrowser/default.nix @@ -12,7 +12,7 @@ let hash = "sha256-xhBIJcEtxDdMXSgQtLAV0UWzPtrvKEil0WV76K5ycBc="; }; - sourceRoot = "source/frontend"; + sourceRoot = "${src.name}/frontend"; npmDepsHash = "sha256-acNIMKHc4q7eiFLPBtKZBNweEsrt+//0VR6dqwXHTvA="; diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 2b7987fa1e46..36de704dbc71 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -59,7 +59,7 @@ in pname = "gephgui"; inherit version src; - sourceRoot = "source/gephgui-wry/gephgui"; + sourceRoot = "${src.name}/gephgui-wry/gephgui"; postPatch = "ln -s ${./package-lock.json} ./package-lock.json"; @@ -79,7 +79,7 @@ in pname = "gephgui-wry"; inherit version src; - sourceRoot = "source/gephgui-wry"; + sourceRoot = "${src.name}/gephgui-wry"; cargoHash = "sha256-lidlUUfHXKPUlICdaVv/SFlyyWsZ7cYHyTJ3kkMn3L4="; diff --git a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix index 5d7535c5289b..b24b0d7b71ba 100644 --- a/pkgs/applications/networking/instant-messengers/element/seshat/default.nix +++ b/pkgs/applications/networking/instant-messengers/element/seshat/default.nix @@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage rec { hash = pinData.srcHash; }; - sourceRoot = "source/seshat-node/native"; + sourceRoot = "${src.name}/seshat-node/native"; nativeBuildInputs = [ nodejs python3 yarn ]; buildInputs = [ sqlcipher ] ++ lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index 1b0185447ac0..87f65e6d05aa 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { daemon = stdenv.mkDerivation { pname = "jami-daemon"; inherit src version meta; - sourceRoot = "source/daemon"; + sourceRoot = "${src.name}/daemon"; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix index a396e9acc0ce..ceeac0acd0c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VWsoyFG+Ro+Y6ngSTMQ7yBYf6awCMNOc6U0WqNeg/jU="; }; - sourceRoot = "source/steam-mobile"; + sourceRoot = "${src.name}/steam-mobile"; installFlags = [ "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2" diff --git a/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/pkgs/applications/networking/kubo-migrator/all-migrations.nix index ecfddcf64915..39a9f141c7a4 100644 --- a/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -13,7 +13,7 @@ let fs-repo-common = pname: version: buildGoModule { inherit pname version; inherit (kubo-migrator-unwrapped) src; - sourceRoot = "source/${pname}"; + sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; vendorSha256 = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 diff --git a/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/pkgs/applications/networking/kubo-migrator/unwrapped.nix index b5531851641a..d5dc1421a58a 100644 --- a/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -19,7 +19,7 @@ buildGoModule rec { hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4="; }; - sourceRoot = "source/fs-repo-migrations"; + sourceRoot = "${src.name}/fs-repo-migrations"; vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk="; diff --git a/pkgs/applications/networking/mullvad/libwg.nix b/pkgs/applications/networking/mullvad/libwg.nix index 287797fd8e67..0ed9599963ef 100644 --- a/pkgs/applications/networking/mullvad/libwg.nix +++ b/pkgs/applications/networking/mullvad/libwg.nix @@ -11,7 +11,7 @@ buildGoModule { src ; - sourceRoot = "source/wireguard/libwg"; + sourceRoot = "${mullvad.src.name}/wireguard/libwg"; vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; diff --git a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix index 0f0bdb5a3d98..31412e72ec98 100644 --- a/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix +++ b/pkgs/applications/networking/owncloud-client/libre-graph-api-cpp-qt-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { hash = "sha256-wbdamPi2XSLWeprrYZtBUDH1A2gdp6/5geFZv+ZqSWk="; }; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 8f08b56d4d5b..ee4fe040bfa2 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "openpaperwork-core"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-core"; + sourceRoot = "${src.name}/openpaperwork-core"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index f1eb43dbdbc8..9566a6010635 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openpaperwork-gtk"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/openpaperwork-gtk"; + sourceRoot = "${src.name}/openpaperwork-gtk"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/office/paperwork/paperwork-backend.nix b/pkgs/applications/office/paperwork/paperwork-backend.nix index c7ddfa09e234..cbb57496427c 100644 --- a/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "paperwork-backend"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-backend"; + sourceRoot = "${src.name}/paperwork-backend"; patches = [ # disables a flaky test https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/issues/1035#note_1493700 diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 36d3b0056b4a..d4ae3070d9af 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { src = sample_documents; }; - sourceRoot = "source/paperwork-gtk"; + sourceRoot = "${src.name}/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index ca6cab2c1e4f..56d84e1039c1 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "paperwork-shell"; inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; - sourceRoot = "source/paperwork-shell"; + sourceRoot = "${src.name}/paperwork-shell"; # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; diff --git a/pkgs/applications/radio/ubertooth/default.nix b/pkgs/applications/radio/ubertooth/default.nix index 2f6eed575b4d..62e645fb6df8 100644 --- a/pkgs/applications/radio/ubertooth/default.nix +++ b/pkgs/applications/radio/ubertooth/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "11r5ag2l5xn4pr7ycicm30w9c3ldn9yiqj1sqnjc79csxl2vrcfw"; }; - sourceRoot = "source/host"; + sourceRoot = "${src.name}/host"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbtbb libpcap libusb1 bluez ]; diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 7696acefd7b2..366d0278227d 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hash = "sha256-NpnJziZXga/T5OavUt3nQ5np8kJ9CFcSmwyg4m6IJsk="; }; - sourceRoot = "source/src"; + sourceRoot = "${src.name}/src"; installPhase = '' install -m755 -D Linux/muscle $out/bin/muscle diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix index e1a21cba0da2..3383a78e1d38 100644 --- a/pkgs/applications/science/biology/star/default.nix +++ b/pkgs/applications/science/biology/star/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-58Y4lzqXwBhRlXcionUg2IhAg5znNUuyr/FsuNZd+5Q="; }; - sourceRoot = "source/source"; + sourceRoot = "${src.name}/source"; postPatch = '' substituteInPlace Makefile --replace "/bin/rm" "rm" diff --git a/pkgs/applications/science/biology/tandem-aligner/default.nix b/pkgs/applications/science/biology/tandem-aligner/default.nix index 5f197bd7f79c..0b3f2520d82b 100644 --- a/pkgs/applications/science/biology/tandem-aligner/default.nix +++ b/pkgs/applications/science/biology/tandem-aligner/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - sourceRoot = "source/tandem_aligner"; + sourceRoot = "${finalAttrs.src.name}/tandem_aligner"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index 99d132912e2f..fb7fd1ece0e6 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -12,7 +12,7 @@ buildPythonPackage { format = "pyproject"; - sourceRoot = "source/build/python"; + sourceRoot = "${autodock-vina.src.name}/build/python"; postPatch = '' # wildcards are not allowed diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/applications/science/logic/z3/tptp.nix index 23136ddf7a70..15f6770404ef 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/applications/science/logic/z3/tptp.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = z3.src; - sourceRoot = "source/examples/tptp"; + sourceRoot = "${src.name}/examples/tptp"; nativeBuildInputs = [cmake]; buildInputs = [z3]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 8a9ae2080365..9b19ec2aec61 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = data.repo_hash; }; - sourceRoot = "source/workhorse"; + sourceRoot = "${src.name}/workhorse"; vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; buildInputs = [ git ]; diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index f03de4589058..575cf96826d4 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { # Upstream splitted the project into gitlint and gitlint-core to # simplify the dependency handling - sourceRoot = "source/gitlint-core"; + sourceRoot = "${src.name}/gitlint-core"; nativeBuildInputs = with python3.pkgs; [ hatch-vcs diff --git a/pkgs/applications/version-management/sapling/default.nix b/pkgs/applications/version-management/sapling/default.nix index 796d76cc6ef8..85a4e4d901f2 100644 --- a/pkgs/applications/version-management/sapling/default.nix +++ b/pkgs/applications/version-management/sapling/default.nix @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication { pname = "sapling"; inherit src version; - sourceRoot = "source/eden/scm"; + sourceRoot = "${src.name}/eden/scm"; # Upstream does not commit Cargo.lock cargoDeps = rustPlatform.importCargoLock { diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 20d4d463a093..0af4b1ceee29 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -30,7 +30,7 @@ let buildsrht-worker = buildGoModule { inherit src version; - sourceRoot = "source/worker"; + sourceRoot = "${src.name}/worker"; pname = "buildsrht-worker"; vendorHash = "sha256-y5RFPbtaGmgPpiV2Q3njeWORGZF1TJRjAbY6VgC1hek="; }; diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix index b5f5ba9e733c..49d2dedbb0c3 100644 --- a/pkgs/applications/video/epgstation/default.nix +++ b/pkgs/applications/video/epgstation/default.nix @@ -49,7 +49,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-a/cDPABWI4lPxvSOI4D90O71A9lm8icPMak/g6DPYQY="; npmRootPath = ""; - sourceRoot = "source/client"; + sourceRoot = "${src.name}/client"; NODE_OPTIONS = "--openssl-legacy-provider"; }; diff --git a/pkgs/applications/video/frigate/web.nix b/pkgs/applications/video/frigate/web.nix index 08b9cef19ee7..01a3e70b436f 100644 --- a/pkgs/applications/video/frigate/web.nix +++ b/pkgs/applications/video/frigate/web.nix @@ -7,7 +7,7 @@ buildNpmPackage { pname = "frigate-web"; inherit version src; - sourceRoot = "source/web"; + sourceRoot = "${src.name}/web"; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix index b89d9dafd900..84defaa98bed 100644 --- a/pkgs/applications/window-managers/tinywl/default.nix +++ b/pkgs/applications/window-managers/tinywl/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "tinywl"; inherit (wlroots) version src; - sourceRoot = "source/tinywl"; + sourceRoot = "${wlroots.src.name}/tinywl"; nativeBuildInputs = [ pkg-config wayland-scanner ]; buildInputs = [ libxkbcommon pixman udev wayland wayland-protocols wlroots ]; diff --git a/pkgs/applications/window-managers/wmderlandc/default.nix b/pkgs/applications/window-managers/wmderlandc/default.nix index 24690eeaa468..340ce6e27d30 100644 --- a/pkgs/applications/window-managers/wmderlandc/default.nix +++ b/pkgs/applications/window-managers/wmderlandc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, libX11, xorgproto }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wmderlandc"; version = "unstable-2020-07-17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0npmlnybblp82mfpinjbz7dhwqgpdqc1s63wc1zs8mlcs19pdh98"; }; - sourceRoot = "source/ipc-client"; + sourceRoot = "${src.name}/ipc-client"; nativeBuildInputs = [ cmake |