Unverified Commit ea08d0de authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #331770 from pbsds/fix-sourceRoot-1722602716 

treewide: use src.name in sourceRoot
parents 54cdfe94 a0396ab4

pkgs/applications/editors/jetbrains/source/build.nix

+4 −4
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ let 
    nativeBuildInputs = [ cmake pkg-config ];

    buildInputs = [ glib xorg.libX11 libdbusmenu ];

    inherit src;

    sourceRoot = "source/native/LinuxGlobalMenu";

    sourceRoot = "${src.name}/native/LinuxGlobalMenu";

    patches = [ ../patches/libdbm-headers.patch ];

    postPatch = "cp ${libdbusmenu-jb}/lib/libdbusmenu-glib.a libdbusmenu-glib.a";

    passthru.patched-libdbusmenu = libdbusmenu-jb;
@@ -97,7 +97,7 @@ let 
    pname = "fsnotifier";

    version = buildVer;

    inherit src;

    sourceRoot = "source/native/fsNotifier/linux";

    sourceRoot = "${src.name}/native/fsNotifier/linux";

    buildPhase = ''

      runHook preBuild

      $CC -O2 -Wall -Wextra -Wpedantic -D "VERSION=\"${buildVer}\"" -std=c11 main.c inotify.c util.c -o fsnotifier
@@ -115,7 +115,7 @@ let 
    pname = "restarter";

    version = buildVer;

    inherit src;

    sourceRoot = "source/native/restarter";

    sourceRoot = "${src.name}/native/restarter";

    cargoHash = restarterHash;

  };
@@ -138,7 +138,7 @@ let 
    pname = "jps-bootstrap";

    version = buildVer;

    inherit src;

    sourceRoot = "source/platform/jps-bootstrap";

    sourceRoot = "${src.name}/platform/jps-bootstrap";

    nativeBuildInputs = [ ant makeWrapper jbr ];

    patches = [ ../patches/kotlinc-path.patch ];

    postPatch = "sed -i 's|KOTLIN_PATH_HERE|${kotlin}|' src/main/java/org/jetbrains/jpsBootstrap/KotlinCompiler.kt";

pkgs/by-name/ar/arrow-cpp/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-ZQqi1RFb4Ey0A0UVCThuIxM7DoFfkLwaeRAc2z8u9so=";

  };



  sourceRoot = "source/cpp";

  sourceRoot = "${finalAttrs.src.name}/cpp";



  # versions are all taken from

  # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt

pkgs/by-name/ar/arrow-glib/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
stdenv.mkDerivation rec {

  pname = "arrow-glib";

  inherit (arrow-cpp) src version;

  sourceRoot = "source/c_glib";

  sourceRoot = "${arrow-cpp.src.name}/c_glib";



  strictDeps = true;

pkgs/by-name/cr/crabfit-api/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  adaptor ? "sql",

}:



rustPlatform.buildRustPackage {

rustPlatform.buildRustPackage rec {

  pname = "crabfit-api";

  version = "0-unstable-2023-08-02";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { 
    hash = "sha256-jy8BrJSHukRenPbZHw4nPx3cSi7E2GSg//WOXDh90mY=";

  };



  sourceRoot = "source/api";

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



  patches = [

    (fetchpatch {

pkgs/by-name/cr/crabfit-frontend/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-jy8BrJSHukRenPbZHw4nPx3cSi7E2GSg//WOXDh90mY=";

  };



  sourceRoot = "source/frontend";

  sourceRoot = "${finalAttrs.src.name}/frontend";



  patches = [

    ./01-localfont.patch