Unverified Commit 35b36b39 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

commonsDaemon: 1.4.1 -> 1.5.1 (#466429)

parents deda10b1 5d0b77e7
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@
}:

stdenv.mkDerivation (finalAttrs: {
  version = "1.4.1";
  version = "1.5.1";
  pname = "commons-daemon";

  src = fetchurl {
    url = "mirror://apache/commons/daemon/binaries/commons-daemon-${finalAttrs.version}-bin.tar.gz";
    sha256 = "sha256-pfKrZ3duDz5wKTn3+SM+ye3UNN129VWCPOeI7JSuYts=";
    hash = "sha256-pw+2L45wlKKtN0qKkihfbOyP+m9+kEHGdJ2WsovcxlY=";
  };

  installPhase = ''
+5 −3
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "jsvc";
  version = "1.4.1";
  version = "1.5.1";

  src = fetchurl {
    url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${finalAttrs.version}-src.tar.gz";
    sha256 = "sha256-yPsiNFbqbfDGHzxlr7So8sZt395BABYEJ7jOmLEhUTE=";
    url = "mirror://apache/commons/daemon/source/commons-daemon-${finalAttrs.version}-src.tar.gz";
    hash = "sha256-SPnE5jrw1zAy7vIzGrjp0+B4SwCLoufLef3XUcUgK6Y=";
  };

  buildInputs = [ commonsDaemon ];
@@ -32,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
    export JAVA_HOME=${jre}
  '';

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-std=gnu17";

  installPhase = ''
    runHook preInstall
    mkdir -p $out/bin