alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

idea: make jdk overrideable using .override

Browse source 
Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
This commit is contained in:
Edward Tjörnhammar 2016-06-21 11:07:56 +02:00
parent 9c5588e99f
commit e945646be3
No known key found for this signature in database
GPG key ID: 7B82CE4A866B6845
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/editors/idea/common.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
, coreutils, gnugrep, which, git, python, unzip, jdk }: , coreutils, gnugrep, which, git, python, unzip }:
{ name, product, version, build, src, wmClass, meta } @ attrs: { name, product, version, build, src, wmClass, jdk, meta } @ attrs:
with stdenv.lib; with stdenv.lib;

14
pkgs/applications/editors/idea/default.nix
View file

@ -12,7 +12,7 @@ let
buildAndroidStudio = { name, version, build, src, license, description, wmClass }: buildAndroidStudio = { name, version, build, src, license, description, wmClass }:
let drv = (mkIdeaProduct rec { let drv = (mkIdeaProduct rec {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "Studio"; product = "Studio";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://developer.android.com/sdk/installing/studio.html; homepage = https://developer.android.com/sdk/installing/studio.html;
@ -38,7 +38,7 @@ let
buildClion = { name, version, build, src, license, description, wmClass }: buildClion = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "CLion"; product = "CLion";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/clion/"; homepage = "https://www.jetbrains.com/clion/";
@ -54,7 +54,7 @@ let
buildIdea = { name, version, build, src, license, description, wmClass }: buildIdea = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "IDEA"; product = "IDEA";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/idea/"; homepage = "https://www.jetbrains.com/idea/";
@ -71,7 +71,7 @@ let
buildRubyMine = { name, version, build, src, license, description, wmClass }: buildRubyMine = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "RubyMine"; product = "RubyMine";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/ruby/"; homepage = "https://www.jetbrains.com/ruby/";
@ -84,7 +84,7 @@ let
buildPhpStorm = { name, version, build, src, license, description, wmClass }: buildPhpStorm = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct { (mkIdeaProduct {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "PhpStorm"; product = "PhpStorm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/phpstorm/"; homepage = "https://www.jetbrains.com/phpstorm/";
@ -101,7 +101,7 @@ let
buildWebStorm = { name, version, build, src, license, description, wmClass }: buildWebStorm = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct { (mkIdeaProduct {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "WebStorm"; product = "WebStorm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/webstorm/"; homepage = "https://www.jetbrains.com/webstorm/";
@ -118,7 +118,7 @@ let
buildPycharm = { name, version, build, src, license, description, wmClass }: buildPycharm = { name, version, build, src, license, description, wmClass }:
(mkIdeaProduct rec { (mkIdeaProduct rec {
inherit name version build src wmClass; inherit name version build src wmClass jdk;
product = "PyCharm"; product = "PyCharm";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://www.jetbrains.com/pycharm/"; homepage = "https://www.jetbrains.com/pycharm/";