Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0f11643580a7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 59d85b9910e8
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 1, 2019

  1. openjdk: add license on Darwin

    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Sep 1, 2019
    Copy the full SHA
    ad4a78f View commit details

  2. openjfx: don't inherit license from openjdk

    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Sep 1, 2019
    Copy the full SHA
    59d85b9 View commit details
5 changes: 4 additions & 1 deletion pkgs/development/compilers/openjdk/darwin/11.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,10 @@ let
home = jdk;
};

meta.platforms = stdenv.lib.platforms.darwin;
meta = with stdenv.lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};

};
in jdk
5 changes: 4 additions & 1 deletion pkgs/development/compilers/openjdk/darwin/8.nix
View file
Original file line number Diff line number Diff line change
@@ -53,7 +53,10 @@ let
home = jdk;
};

meta.platforms = stdenv.lib.platforms.darwin;
meta = with stdenv.lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};

};
in jdk
5 changes: 4 additions & 1 deletion pkgs/development/compilers/openjdk/darwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,10 @@ let
home = jdk;
};

meta.platforms = stdenv.lib.platforms.darwin;
meta = with stdenv.lib; {
license = licenses.gpl2;
platforms = platforms.darwin;
};

};
in jdk
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/openjfx/11.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];
4 changes: 2 additions & 2 deletions pkgs/development/compilers/openjdk/openjfx/12.nix
View file
Original file line number Diff line number Diff line change
@@ -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" ];