Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7b578d49cd11
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ce24ce04ac8e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 18, 2019

  1. avro-tools: properly installing the jar file

    @mmahut
    mmahut committed Aug 18, 2019
    Copy the full SHA
    1ebcffe View commit details

  2. Merge pull request #66848 from mmahut/avro-tools 

    avro-tools: properly installing the jar file
    @srhb
    srhb authored Aug 18, 2019
    Copy the full SHA
    ce24ce0 View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 pkgs/development/tools/avro-tools/default.nix
9 changes: 4 additions & 5 deletions pkgs/development/tools/avro-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, jre, lib }:

stdenv.mkDerivation rec {
pname = "avro-tools";
version = "1.9.0";
name = "avro-tools-${version}";

src = fetchurl {
url =
"https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${name}.jar";
"https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
sha256 = "164mcz7ljd2ikwsq9ba98galcjar4g4n6ag7kkh466nwrpbmd2zi";
};

@@ -19,11 +19,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
mkdir -p $out/libexec/avro-tools
mv $src ${name}.jar
cp ${name}.jar $out/libexec/avro-tools
cp $src $out/libexec/avro-tools/${pname}.jar
makeWrapper ${jre}/bin/java $out/bin/avro-tools \
--add-flags "-jar $out/libexec/avro-tools/${name}.jar"
--add-flags "-jar $out/libexec/avro-tools/${pname}.jar"
'';

meta = with stdenv.lib; {