Unverified Commit 05ac36fa authored by Alyssa Ross's avatar Alyssa Ross
Browse files

treewide: use dontCargo{Build,Check,Install} 

These are a better way to do the same thing.  They didn't exist when I
needed to do this in the zcash derivation, and then I didn't realise
they'd started existing when I did the same in cosmic-comp.
parent 91d80e64

pkgs/applications/blockchains/zcash/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } rec { 
  # Use the stdenv default phases (./configure; make) instead of the

  # ones from buildRustPackage.

  configurePhase = "configurePhase";

  buildPhase = "buildPhase";

  checkPhase = "checkPhase";

  installPhase = "installPhase";

  dontCargoBuild = true;

  dontCargoCheck = true;

  dontCargoInstall = true;



  postPatch = ''

    # Have to do this here instead of in preConfigure because

pkgs/by-name/co/cosmic-comp/package.nix

+1 −2
Original line number Diff line number Diff line
@@ -83,8 +83,7 @@ rustPlatform.buildRustPackage rec { 
    "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}"

  ];



  # Use default stdenv installPhase, not the buildRustPackage one.

  installPhase = "installPhase";

  dontCargoInstall = true;



  # These libraries are only used by the X11 backend, which will not

  # be the common case, so just make them available, don't link them.