From 393c770cc23122730547c087a60ac5d54095ecd0 Mon Sep 17 00:00:00 2001 From: Philipp Hausmann Date: Thu, 3 Dec 2020 12:05:14 +0100 Subject: [PATCH] mucommander: Use jdk11 & gradle6 --- pkgs/applications/misc/mucommander/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index e598e099d065..a1e02dbe18e0 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, gradle_6, perl, makeWrapper, jdk11, gsettings-desktop-schemas }: let version = "0.9.3-3"; @@ -36,7 +36,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src postPatch; - nativeBuildInputs = [ gradle_4_10 perl ]; + nativeBuildInputs = [ gradle_6 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { inherit name src postPatch; - nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; + nativeBuildInputs = [ gradle_6 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -73,7 +73,7 @@ in stdenv.mkDerivation { tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 wrapProgram $out/bin/mucommander \ --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ - --set JAVA_HOME ${jre} + --set JAVA_HOME ${jdk11} ''; meta = with stdenv.lib; { @@ -81,6 +81,9 @@ in stdenv.mkDerivation { description = "Cross-platform file manager"; license = licenses.gpl3; maintainers = with maintainers; [ volth ]; + # build is broken on MacOS + # https://github.com/NixOS/nixpkgs/pull/105784 + broken = stdenv.isDarwin; platforms = platforms.all; }; }