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

treewide: remove env-vars from build outputs (#397760)

parents 5c78ecf0 bdf59686
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
{
  stdenv,
  fetchurl,
  fetchzip,
  lib,
  makeWrapper,
  unzip,
@@ -25,17 +25,16 @@ stdenv.mkDerivation rec {
  pname = "davmail";
  version = "6.3.0";

  src = fetchurl {
  src = fetchzip {
    url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
    hash = "sha256-Yh61ZHsEMF6SchLEyBV3rRI7pJ/bvR2K4G8U6jrPa3A=";
    hash = "sha256-zJMwCFX/uJnLeThj6/t2usBRM+LIuamZt0EFLG3N+8k=";
    stripRoot = false;
  };

  postPatch = ''
    sed -i -e '/^JAVA_OPTS/d' davmail
  '';

  sourceRoot = ".";

  nativeBuildInputs = [
    makeWrapper
    unzip
+8 −1
Original line number Diff line number Diff line
@@ -17,12 +17,19 @@ stdenv.mkDerivation (finalAttrs: rec {
    hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI=";
  };

  sourceRoot = "source";

  unpackPhase = ''
    runHook preUnpack
    unzip $src -d "$sourceRoot"
    runHook postUnpack
  '';

  patches = [
    # set GEOSERVER_DATA_DIR to current working directory if not provided
    ./data-dir.patch
  ];

  sourceRoot = ".";
  nativeBuildInputs = [
    unzip
    makeWrapper
+8 −1
Original line number Diff line number Diff line
@@ -38,7 +38,14 @@ stdenv.mkDerivation rec {
    passthru.sources.${stdenv.hostPlatform.system}
      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

  sourceRoot = ".";
  sourceRoot = "source";

  unpackPhase = ''
    runHook preUnpack
    mkdir -p "$sourceRoot"
    tar xf $src --directory="$sourceRoot"
    runHook postUnpack
  '';

  strictDeps = true;

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

  sourceRoot = ".";
  sourceRoot = "source";

  unpackPhase = ''
    runHook preUnpack
    unzip $src -d $sourceRoot
    runHook postUnpack
  '';

  installPhase = ''
    runHook preInstall
+7 −1
Original line number Diff line number Diff line
@@ -17,8 +17,14 @@ stdenv.mkDerivation (finalAttrs: {

  preferLocalBuild = true;

  nativeBuildInputs = [ unzrip ];

  sourceRoot = "source";

  unpackPhase = ''
    ${unzrip}/bin/unzrip $src
    runHook preUnpack
    unzrip $src -d "$sourceRoot"
    runHook postUnpack
  '';

  installPhase =
Loading