nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-15 03:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

global-platform-pro: stop overwriting maven

Browse Source
This commit is contained in:
Sandro Jäckel
2024-07-15 15:12:40 +02:00
parent a699e2eeff
commit 609fcb404d
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,6 @@
{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }:
let
mavenJdk8 = maven.override {
jdk = jdk8;
};
defineMvnWrapper = ''
mvn()
{
@@ -16,7 +12,7 @@ let
}
'';
in
mavenJdk8.buildMavenPackage rec {
maven.buildMavenPackage rec {
pname = "global-platform-pro";
version = "20.01.23";
GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty
@@ -28,6 +24,7 @@ mavenJdk8.buildMavenPackage rec {
sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
};
mvnJdk = jdk8;
mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
nativeBuildInputs = [ jdk8 makeWrapper ];