From 7582da5d8bf8613e4e3b4a10d0516e2faa3dc511 Mon Sep 17 00:00:00 2001 From: zraexy Date: Sat, 4 Mar 2017 10:21:25 -0900 Subject: [PATCH] eclipse: import builder instead of callPackage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switched from callPackage to import so that dependencies are passed instead of being grabbed from pkgs. [Bjørn: wrap overlong line.] --- pkgs/applications/editors/eclipse/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index d9d731f3835..9271579346a 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, libXtst, jdk +, glib, gtk2, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage @@ -10,7 +10,10 @@ assert stdenv ? glibc; rec { - buildEclipse = callPackage ./build-eclipse.nix { }; + buildEclipse = import ./build-eclipse.nix { + inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib + jdk glib gtk2 libXtst webkitgtk2 makeWrapper; + }; ### Eclipse CPP