Unverified Commit 8e3fa041 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

{swt,tuxguitar}: several small fixes (#462254)

parents d846811f 7be3e730

pkgs/by-name/sw/swt/package.nix

+11 −3
Original line number Diff line number Diff line
@@ -11,8 +11,10 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "swt";

  version = "4.34";

  fullVersion = "${finalAttrs.version}-202411201800";

  # NOTE: In case you wish to override, don't override version, override

  # `fullVersion`.

  version = builtins.elemAt (lib.splitString "-" finalAttrs.fullVersion) 1;

  fullVersion = "R-4.34-202411201800";



  hardeningDisable = [ "format" ];
@@ -44,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { 
    in

    assert srcMetadata != null;

    fetchzip {

      url = "https://archive.eclipse.org/eclipse/downloads/drops4/R-${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";

      url = "https://download.eclipse.org/eclipse/downloads/drops4/${finalAttrs.fullVersion}/swt-${finalAttrs.version}-${srcMetadata.platform}.zip";

      inherit (srcMetadata) hash;

      stripRoot = false;

      postFetch =
@@ -142,6 +144,12 @@ stdenv.mkDerivation (finalAttrs: { 
      mpl20

    ];

    maintainers = [ ];

    # The darwin src zip file holds simply a prebuilt swt.jar file

    sourceProvenance = lib.optionals stdenv.hostPlatform.isDarwin [

      lib.sourceTypes.binaryNativeCode

    ];

    platforms = lib.attrNames finalAttrs.passthru.srcMetadataByPlatform;

    # Fails with: `java.nio.file.NoSuchFileException: ../swt.jar`

    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;

  };

})

pkgs/by-name/tu/tuxguitar/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -75,8 +75,9 @@ stdenv.mkDerivation (finalAttrs: { 
    '';

    homepage = "https://github.com/helge17/tuxguitar";

    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];

    license = lib.licenses.lgpl2;

    license = lib.licenses.lgpl21Plus;

    maintainers = with lib.maintainers; [ ardumont ];

    platforms = [ "x86_64-linux" ];

    mainProgram = "tuxguitar";

  };

})