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

openjfx: don't inherit license from openjdk

Browse Source
This commit is contained in:
Ben Wolsieffer 2019-08-31 12:09:56 -04:00 committed by Frederik Rietdijk
parent ad4a78fee8
commit 59d85b9910
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/openjdk/openjfx/11.nix
View File

@ -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 , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg, python, ruby
, openjdk11-bootstrap }: , openjdk11-bootstrap }:
@ -99,7 +99,7 @@ in makePackage {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/; homepage = http://openjdk.java.net/projects/openjfx/;
license = openjdk11.meta.license; license = licenses.gpl2;
description = "The next-generation Java client toolkit."; description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];

4
pkgs/development/compilers/openjdk/openjfx/12.nix
View File

@ -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 , pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
, ffmpeg, python, ruby }: , ffmpeg, python, ruby }:
@ -99,7 +99,7 @@ in makePackage {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://openjdk.java.net/projects/openjfx/; homepage = http://openjdk.java.net/projects/openjfx/;
license = openjdk12.meta.license; license = licenses.gpl2;
description = "The next-generation Java client toolkit."; description = "The next-generation Java client toolkit.";
maintainers = with maintainers; [ abbradar ]; maintainers = with maintainers; [ abbradar ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];