From b0ed229aad958ef2b02d5f034cb18df1a0be83e2 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Tue, 13 Apr 2021 23:40:23 +0200 Subject: [PATCH] gradle: Pin pkgs to Gradle 6 that fail with 7 --- pkgs/applications/networking/p2p/frostwire/default.nix | 6 +++--- pkgs/development/tools/scenebuilder/default.nix | 2 +- pkgs/games/shattered-pixel-dungeon/default.nix | 6 +++--- pkgs/servers/ma1sd/default.nix | 6 +++--- pkgs/servers/mxisd/default.nix | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 4253969a30a..b3b277bf130 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }: +{ lib, stdenv, fetchFromGitHub, gradle_6, perl, jre, makeWrapper, makeDesktopItem, mplayer }: let version = "6.6.7-build-529"; @@ -25,7 +25,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - buildInputs = [ gradle perl ]; + buildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) ( cd desktop @@ -47,7 +47,7 @@ in stdenv.mkDerivation { inherit name src; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ gradle ]; + buildInputs = [ gradle_6 ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix index 3d3b6bbe9d7..97c03fb4574 100644 --- a/pkgs/development/tools/scenebuilder/default.nix +++ b/pkgs/development/tools/scenebuilder/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }: let # 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"; version = "15.0.1"; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 8d92c88e1be..2ced60ef890 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , makeWrapper , fetchFromGitHub , nixosTests -, gradle +, gradle_6 , perl , jre , libpulseaudio @@ -33,7 +33,7 @@ let deps = stdenv.mkDerivation { pname = "${pname}-deps"; inherit version src postPatch; - nativeBuildInputs = [ gradle perl ]; + nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) # https://github.com/gradle/gradle/issues/4426 @@ -54,7 +54,7 @@ let in stdenv.mkDerivation rec { inherit pname version src postPatch; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index 5947d18eb9e..46578019194 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: let name = "ma1sd-${version}"; @@ -16,7 +16,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle perl git ]; + nativeBuildInputs = [ gradle_6 perl git ]; buildPhase = '' export MA1SD_BUILD_VERSION=${rev} @@ -41,7 +41,7 @@ let in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildInputs = [ jre ]; buildPhase = '' diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index b2ea5420809..48f49b57fca 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre, git, gradle, perl, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, jre, git, gradle_6, perl, makeWrapper }: let name = "mxisd-${version}"; @@ -16,7 +16,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src; - nativeBuildInputs = [ gradle perl git ]; + nativeBuildInputs = [ gradle_6 perl git ]; buildPhase = '' export MXISD_BUILD_VERSION=${rev} @@ -41,7 +41,7 @@ let in stdenv.mkDerivation { inherit name src version; - nativeBuildInputs = [ gradle perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildInputs = [ jre ]; patches = [ ./0001-gradle.patch ];