diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:07:57 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 12:09:03 +0200 |
| commit | 6b27ceb006ace21f9157034ac743242a0147eeec (patch) | |
| tree | de8c80579090028b8a918796fd7a8eda3c4cecf0 /pkgs/applications/editors/idea/common.nix | |
| parent | 14c038dd0390a9b24969f0138356b5c7520b9fdf (diff) | |
| parent | b3bcb59bd5fddc3c0f74bbe120de561bbea29878 (diff) | |
| download | nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.gz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.bz2 nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.lz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.xz nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.tar.zst nixlib-6b27ceb006ace21f9157034ac743242a0147eeec.zip | |
Merge 'master' into staging and re-revert merge
... from staging to master, reverted temporarily in aa9a04883e34.
Diffstat (limited to 'pkgs/applications/editors/idea/common.nix')
| -rw-r--r-- | pkgs/applications/editors/idea/common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 556b333ce757..170a12d6d695 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -1,7 +1,7 @@ { 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; |