treewide: stdenv.lib -> lib
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user