From 59d85b9910e8b76be9b2970bb268c6689bebc205 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sat, 31 Aug 2019 12:09:56 -0400 Subject: [PATCH] openjfx: don't inherit license from openjdk --- pkgs/development/compilers/openjdk/openjfx/11.nix | 4 ++-- pkgs/development/compilers/openjdk/openjfx/12.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index e1c94ffb597..9e6d30efda8 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, openjdk11, gradleGen, pkgconfig, perl, cmake +{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby , openjdk11-bootstrap }: @@ -99,7 +99,7 @@ in makePackage { meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk11.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/12.nix b/pkgs/development/compilers/openjdk/openjfx/12.nix index 22c608f36c1..418c58ac683 100644 --- a/pkgs/development/compilers/openjdk/openjfx/12.nix +++ b/pkgs/development/compilers/openjdk/openjfx/12.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, openjdk11_headless, openjdk12, gradleGen +{ stdenv, lib, fetchurl, writeText, openjdk11_headless, gradleGen , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib , ffmpeg, python, ruby }: @@ -99,7 +99,7 @@ in makePackage { meta = with stdenv.lib; { homepage = http://openjdk.java.net/projects/openjfx/; - license = openjdk12.meta.license; + license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; platforms = [ "i686-linux" "x86_64-linux" ];