diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-15 20:21:58 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-16 17:58:11 +0700 |
commit | badf51221db8fae81bf9948c39eaf8342dfd5597 (patch) | |
tree | 34eeb35ca97f0b081da465e9ddd6c120a9d2b7df /pkgs/applications/editors/eclipse | |
parent | a9bb54359eeedf2594fdf191de5b673fd1dd102d (diff) | |
download | nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.gz nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.bz2 nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.lz nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.xz nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.tar.zst nixlib-badf51221db8fae81bf9948c39eaf8342dfd5597.zip |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/applications/editors/eclipse')
-rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 0282dc95f72e..1ddb67071109 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 +{ lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender , zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, perl, ... }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst makeWrapper zlib - ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; + ] ++ lib.optional (webkitgtk != null) webkitgtk; buildCommand = '' # Unpack tarball. @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse - [ -f $libCairo ] && patchelf --set-rpath ${stdenv.lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo + [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo # Create wrapper script. Pass -configuration to store # settings in ~/.eclipse/org.eclipse.platform_<version> rather @@ -41,7 +41,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 (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst ] ++ lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 586e2343cd3e..cff482e887d3 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser @@ -148,7 +148,7 @@ in rec { pluginEnv = buildEnv { name = "eclipse-plugins"; paths = - with stdenv.lib; + with lib; filter (x: x ? isEclipsePlugin) (closePropagation plugins); }; @@ -156,11 +156,11 @@ in rec { # add the property indicating the plugin directory. dropinPropName = "org.eclipse.equinox.p2.reconciler.dropins.directory"; dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins"; - jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); + jvmArgsText = lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]); # Base the derivation name on the name of the underlying # Eclipse. - name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name; + name = (lib.meta.appendToName "with-plugins" eclipse).name; in runCommand name { buildInputs = [ makeWrapper ]; } '' mkdir -p $out/bin $out/etc |