diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-08-31 12:09:56 -0400 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-09-01 17:34:20 +0200 |
| commit | 59d85b9910e8b76be9b2970bb268c6689bebc205 (patch) | |
| tree | c97edd57e52292aef9e07f39eb6aa2a61b00b81a /pkgs | |
| parent | ad4a78fee8b648153279c15f2cd77ab85ec1e635 (diff) | |
| download | nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar.gz nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar.bz2 nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar.lz nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar.xz nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.tar.zst nixlib-59d85b9910e8b76be9b2970bb268c6689bebc205.zip | |
openjfx: don't inherit license from openjdk
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/11.nix | 4 | ||||
| -rw-r--r-- | 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 e1c94ffb5979..9e6d30efda81 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 22c608f36c1d..418c58ac683e 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" ]; |