Unverified Commit 7d5f7c86 authored by kirillrdy's avatar kirillrdy Committed by GitHub
Browse files

eclipses: add version attribute (#396370)

parents a5a9e638 7d7ac5d1

pkgs/applications/editors/eclipse/build-eclipse.nix

+4 −4
Original line number Diff line number Diff line
@@ -21,15 +21,15 @@ 
}:



{

  name,

  pname,

  src ? builtins.getAttr stdenv.hostPlatform.system sources,

  sources ? null,

  description,

  productVersion,

  version,

}:



stdenv.mkDerivation rec {

  inherit name src;

  inherit pname version src;



  desktopItem = makeDesktopItem {

    name = "Eclipse";
@@ -98,7 +98,7 @@ stdenv.mkDerivation rec { 
      } \

      --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \

      --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"

      --add-flags "-configuration \$HOME/.eclipse/''${productId}_${version}/configuration"



    # Create desktop item.

    mkdir -p $out/share/applications

pkgs/applications/editors/eclipse/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ let 
  };

  buildEclipse =

    eclipseData:

    buildEclipseUnversioned (

      eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }

    );

    buildEclipseUnversioned (eclipseData // { version = "${platform_major}.${platform_minor}"; });



  generateEclipse =

    id:
@@ -85,7 +83,7 @@ let 
      {

        name = "eclipse-${lib.strings.toLower id}";

        value = buildEclipse {

          name = "eclipse-${lib.strings.toLower id}-${platform_major}.${platform_minor}";

          pname = "eclipse-${lib.strings.toLower id}";

          inherit description;

          src = fetchurl {

            url =