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

gradle: Pin pkgs to Gradle 6 that fail with 7

Browse Source
This commit is contained in:
Lorenz Leutgeb 2021-04-13 23:40:23 +02:00
parent da62033a9a
commit b0ed229aad
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/p2p/frostwire/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: { lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
let let
version = "6.6.7-build-529"; version = "6.6.7-build-529";
@ -25,7 +25,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${name}-deps"; name = "${name}-deps";
inherit src; inherit src;
buildInputs = [ gradle perl ]; buildInputs = [ gradle_6 perl ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
( cd desktop ( cd desktop
@ -47,7 +47,7 @@ in stdenv.mkDerivation {
inherit name src; inherit name src;
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ gradle ]; buildInputs = [ gradle_6 ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)

2
pkgs/development/tools/scenebuilder/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: { lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let let
# The default one still uses jdk8 (#89731) # The default one still uses jdk8 (#89731)
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest; gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
pname = "scenebuilder"; pname = "scenebuilder";
version = "15.0.1"; version = "15.0.1";

6
pkgs/games/shattered-pixel-dungeon/default.nix
View File

@ -2,7 +2,7 @@
, makeWrapper , makeWrapper
, fetchFromGitHub , fetchFromGitHub
, nixosTests , nixosTests
, gradle , gradle_6
, perl , perl
, jre , jre
, libpulseaudio , libpulseaudio
@ -33,7 +33,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "${pname}-deps"; pname = "${pname}-deps";
inherit version src postPatch; inherit version src postPatch;
nativeBuildInputs = [ gradle perl ]; nativeBuildInputs = [ gradle_6 perl ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
# https://github.com/gradle/gradle/issues/4426 # https://github.com/gradle/gradle/issues/4426
@ -54,7 +54,7 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
inherit pname version src postPatch; inherit pname version src postPatch;
nativeBuildInputs = [ gradle perl makeWrapper ]; nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)

6
pkgs/servers/ma1sd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: { lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let let
name = "ma1sd-${version}"; name = "ma1sd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${name}-deps"; name = "${name}-deps";
inherit src; inherit src;
nativeBuildInputs = [ gradle perl git ]; nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = '' buildPhase = ''
export MA1SD_BUILD_VERSION=${rev} export MA1SD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name src version; inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ]; nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ]; buildInputs = [ jre ];
buildPhase = '' buildPhase = ''

6
pkgs/servers/mxisd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: { lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }:
let let
name = "mxisd-${version}"; name = "mxisd-${version}";
@ -16,7 +16,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${name}-deps"; name = "${name}-deps";
inherit src; inherit src;
nativeBuildInputs = [ gradle perl git ]; nativeBuildInputs = [ gradle_6 perl git ];
buildPhase = '' buildPhase = ''
export MXISD_BUILD_VERSION=${rev} export MXISD_BUILD_VERSION=${rev}
@ -41,7 +41,7 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name src version; inherit name src version;
nativeBuildInputs = [ gradle perl makeWrapper ]; nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildInputs = [ jre ]; buildInputs = [ jre ];
patches = [ ./0001-gradle.patch ]; patches = [ ./0001-gradle.patch ];