public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup: points mentioned by timokau

Browse Source
This commit is contained in:
Léo Gaspard 2018-08-17 00:19:40 +09:00
parent cccfa8f395
commit a52ad2569a
No known key found for this signature in database
GPG Key ID: 8A55848B6090F9CF
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/tools/global-platform-pro/default.nix
View File

@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2"; sha256 = "0rk81x2y7vx1caxm6wa59fjrfxmjn7s8yxaxm764p8m2qxk3m4y2";
}; };
# This patch hardcodes the return of a git command the build system tries to
# run. As `fetchFromGitHub` doesn't fetch a full-fledged git repository,
# this command can only fail at build-time. As a consequence, we include the
# `describeVersion` variable defined above here.
patches = [ (writeText "${name}-version.patch" '' patches = [ (writeText "${name}-version.patch" ''
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 1e5a82d..1aa01fe 100644 index 1e5a82d..1aa01fe 100644
@ -43,12 +47,16 @@ stdenv.mkDerivation rec {
inherit src patches; inherit src patches;
nativeBuildInputs = [ jdk maven ]; nativeBuildInputs = [ jdk maven ];
buildPhase = '' buildPhase = ''
while mvn package -Dmaven.repo.local=$out/.m2 -Dmaven.wagon.rto=5000; [ $? = 1 ]; do while ! mvn package "-Dmaven.repo.local=$out/.m2" -Dmaven.wagon.rto=5000; do
echo "timeout, restart maven to continue downloading" echo "timeout, restart maven to continue downloading"
done done
''; '';
# keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside
installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; installPhase = ''
find "$out/.m2" -type f \
-regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' \
-delete
'';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if"; outputHash = "15bbi7z9v601all9vr2azh8nk8rpz2vd91yvvw8id6birnbhn3if";
@ -57,19 +65,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ jdk maven makeWrapper ]; nativeBuildInputs = [ jdk maven makeWrapper ];
buildPhase = '' buildPhase = ''
mvn package --offline -Dmaven.repo.local=$( \ cp -dpR "${deps}/.m2" ./
cp -dpR ${deps}/.m2 ./ && \ chmod -R +w .m2
chmod +w -R .m2 && \ mvn package --offline -Dmaven.repo.local="$(pwd)/.m2"
pwd \
)/.m2
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/lib/java $out/share/java mkdir -p "$out/lib/java" "$out/share/java"
cp -R target/apidocs $out/doc cp -R target/apidocs "$out/doc"
cp target/gp.jar $out/share/java cp target/gp.jar "$out/share/java"
makeWrapper ${jre_headless}/bin/java $out/bin/gp \ makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \
--add-flags "-jar $out/share/java/gp.jar" \ --add-flags "-jar '$out/share/java/gp.jar'" \
--prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib" --prefix LD_LIBRARY_PATH : "${pcsclite.out}/lib"
''; '';