diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 12:49:52 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-03-05 14:53:27 +0100 |
commit | 565bd805e6aea9258ead5449b46c5e56ae0568fb (patch) | |
tree | 81a23c558823fc865d180bb8b6318d24ec38729d /pkgs/development/libraries/java | |
parent | 25a78f7234ced8840610178a695078b5b08d9e6b (diff) | |
parent | 97693915e1d31478528ee72e8d1fea5aa384577b (diff) | |
download | nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.gz nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.bz2 nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.lz nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.xz nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.tar.zst nixpkgs-565bd805e6aea9258ead5449b46c5e56ae0568fb.zip |
Merge branch 'master'
Diffstat (limited to 'pkgs/development/libraries/java')
-rw-r--r-- | pkgs/development/libraries/java/dbus-java/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/java/libmatthew-java/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 8ca3bf1cd34..23adfd80caa 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { sed -i -e "s|all: bin doc man|all: bin|" \ -e "s|install: install-bin install-man install-doc|install: install-bin|" Makefile ''; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 3b28c3a2bd5..87753533169 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { JAVA_HOME=jdk; PREFIX=''''${out}''; buildInputs = [ jdk ]; - maintainers = [ stdenv.lib.maintainers.sander ]; meta = { platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.sander ]; }; } |