diff options
| author | Kirill Boltaev <aske@fmap.me> | 2016-09-12 00:24:51 +0300 |
|---|---|---|
| committer | Kirill Boltaev <aske@fmap.me> | 2016-09-12 18:26:06 +0300 |
| commit | bccd75094fd5108b3d834ad3a86e056eed3b0337 (patch) | |
| tree | 8954184c0376ef2f8218b7df7049edde7ef6a49b /pkgs/applications/editors/eclipse | |
| parent | 30107249b1a5681771591cd65aa4f1c98f4cb023 (diff) | |
| download | nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.gz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.bz2 nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.lz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.xz nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.tar.zst nixlib-bccd75094fd5108b3d834ad3a86e056eed3b0337.zip | |
treewide: explicitly specify gtk and related package versions
Diffstat (limited to 'pkgs/applications/editors/eclipse')
| -rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 609c5e3c651f..74707c65b6ca 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3d59777e5f0c..c688065e6ea9 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jdk +, glib, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage -} @ args: +}: assert stdenv ? glibc; rec { - buildEclipse = import ./build-eclipse.nix args; + buildEclipse = callPackage ./build-eclipse.nix { }; eclipse-sdk-35 = buildEclipse { name = "eclipse-sdk-3.5.2"; |