Unverified Commit 006b0b6a authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

Merge pull request #131682 from Stunkymonkey/development-phases

development/tools: deprecate phases
parents 21889a97 02b4d1c9
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ let
        inherit sha256;
      };

      phases = "installPhase";
      dontUnpack = true;

      installPhase = ''
        install -Dm755 $src $out/bin/amm
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    gemset = ./gemset.nix;
  };

  phases = [ "installPhase" ];
  dontUnpack = true;

  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ env ];
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ makeWrapper ];
  buildInputs = [ jdk deps ];

  phases = [ "installPhase" ];
  dontUnpack = true;

  extraJavaOpts = "-XX:+UseG1GC -XX:+UseStringDeduplication -Xss4m -Xms100m";

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ in stdenv.mkDerivation rec {
    sha256 = "1894g6fymr8kra9vwhbmnrcr58l022mcd7g9ans4zd3izla2j3gx";
  };

  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

  patches = lib.optionalString (rubies != null) [
    ./env.patch
  ];
+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@
stdenv.mkDerivation {
  name = "distcc-masq-${gccRaw.name}";

  phases = [ "installPhase" ];
  dontUnpack = true;

  installPhase = ''
    mkdir -p $out/bin

Loading