Unverified Commit 54c52cb2 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #294334 from ShamrockLee/sourceroot-fix 

treewide: fix hard-coded `sourceRoot` prefix for `fetchgit`-based `src`
parents 9336998b 91b3db13

pkgs/applications/editors/vim/plugins/overrides.nix

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ 
      spectre_oxi = rustPlatform.buildRustPackage {

        pname = "spectre_oxi";

        inherit (old) version src;

        sourceRoot = "source/spectre_oxi";

        sourceRoot = "${old.src.name}/spectre_oxi";



        cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E=";

pkgs/applications/graphics/awesomebump/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let 
  qtnproperty = mkDerivation {

    name = "qtnproperty";

    inherit src;

    sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";

    sourceRoot = "${src.name}/Sources/utils/QtnProperty";

    patches = [ ./qtnproperty-parallel-building.patch ];

    buildInputs = [ qtscript qtbase qtdeclarative ];

    nativeBuildInputs = [ qmake flex bison ];

pkgs/applications/networking/geph/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ in 
      pname = "${pname}-pnpm-deps";

      inherit src version;



      sourceRoot = "source/gephgui-wry/gephgui";

      sourceRoot = "${src.name}/gephgui-wry/gephgui";



      nativeBuildInputs = [

        jq
@@ -95,7 +95,7 @@ in 
      pname = "gephgui-wry";

      inherit version src;



      sourceRoot = "source/gephgui-wry";

      sourceRoot = "${src.name}/gephgui-wry";



      cargoLock = {

        lockFile = ./Cargo.lock;

pkgs/applications/networking/localsend/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
  pname = "localsend";

  version = "1.14.0";



  linux = flutter313.buildFlutterApplication {

  linux = flutter313.buildFlutterApplication rec {

    inherit pname version;



    src = fetchFromGitHub {
@@ -23,7 +23,7 @@ let 
      hash = "sha256-CO0uFcZnOfE31EZxRUpgtod3+1lyXPpbytHB45DEM98=";

    };



    sourceRoot = "source/app";

    sourceRoot = "${src.name}/app";



    pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -59,7 +59,7 @@ let 


    passthru.updateScript = ./update.sh;



    meta = meta // {

    meta = metaCommon // {

      mainProgram = "localsend_app";

    };

  };
@@ -81,13 +81,13 @@ let 
      cp -r *.app $out/Applications

    '';



    meta = meta // {

    meta = metaCommon // {

      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

      platforms = [ "x86_64-darwin" "aarch64-darwin" ];

    };

  };



  meta = with lib; {

  metaCommon = with lib; {

    description = "An open source cross-platform alternative to AirDrop";

    homepage = "https://localsend.org/";

    license = licenses.mit;

pkgs/applications/science/chemistry/autodock-vina/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-yguUMEX0tn75wKrPKyqlCYbBFaEwC5b1s3k9xept1Fw=";

  };



  sourceRoot =

    if stdenv.isDarwin

    then "source/build/mac/release"

    else "source/build/linux/release";

  sourceRoot = "${finalAttrs.src.name}/build/${

    if stdenv.hostPlatform.isDarwin then "mac"

    else "linux"

  }/release";



  buildInputs = [

    boost'