cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #105784 from phile314/mucmd-jdk11

Browse source 
mucommander: Use jdk11 & gradle6
This commit is contained in:
Sandro 2020-12-11 08:44:06 +01:00 committed by GitHub
commit 4edafadc03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/misc/mucommander/default.nix
View file

@ -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 let
version = "0.9.3-3"; version = "0.9.3-3";
@ -36,7 +36,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
name = "${name}-deps"; name = "${name}-deps";
inherit src postPatch; inherit src postPatch;
nativeBuildInputs = [ gradle_4_10 perl ]; nativeBuildInputs = [ gradle_6 perl ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
gradle --no-daemon build gradle --no-daemon build
@ -54,7 +54,7 @@ let
in stdenv.mkDerivation { in stdenv.mkDerivation {
inherit name src postPatch; inherit name src postPatch;
nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; nativeBuildInputs = [ gradle_6 perl makeWrapper ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
@ -73,7 +73,7 @@ in stdenv.mkDerivation {
tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1
wrapProgram $out/bin/mucommander \ wrapProgram $out/bin/mucommander \
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ --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; { meta = with stdenv.lib; {
@ -81,6 +81,9 @@ in stdenv.mkDerivation {
description = "Cross-platform file manager"; description = "Cross-platform file manager";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ volth ]; maintainers = with maintainers; [ volth ];
# build is broken on MacOS
# https://github.com/NixOS/nixpkgs/pull/105784
broken = stdenv.isDarwin;
platforms = platforms.all; platforms = platforms.all;
}; };
} }