diff --git a/pkgs/all-packages.nix b/pkgs/all-packages.nix index d1d060e..33d0196 100644 --- a/pkgs/all-packages.nix +++ b/pkgs/all-packages.nix @@ -1,9 +1,8 @@ final: prev: { - asus-numpad = prev.callPackage ./asus-numpad.nix { }; enigma = prev.callPackage ./enigma.nix { }; - jaspersoft-studio-community = prev.callPackage ./jaspersoft-studio-community.nix { }; - json2cdn = prev.callPackage ./json2cdn/package.nix { }; - koi = prev.kdePackages.callPackage ./koi.nix { }; - openwebstart = prev.callPackage ./openwebstart.nix { }; vineflower = prev.callPackage ./vineflower.nix { }; + koi = prev.kdePackages.callPackage ./koi.nix { }; + asus-numpad = prev.callPackage ./asus-numpad.nix { }; + openwebstart = prev.callPackage ./openwebstart.nix { }; + json2cdn = prev.callPackage ./json2cdn/package.nix { }; } diff --git a/pkgs/jaspersoft-studio-community.nix b/pkgs/jaspersoft-studio-community.nix deleted file mode 100644 index eb0f3cb..0000000 --- a/pkgs/jaspersoft-studio-community.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - stdenvNoCC, - autoPatchelfHook, - copyDesktopItems, - makeDesktopItem, - requireFile, - temurin-bin-17, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "jaspersoft-studio-community"; - version = "6.21.3"; - - src = requireFile { - name = "js-studiocomm_${finalAttrs.version}_linux_x86_64.tgz"; - url = "https://community.jaspersoft.com/download-jaspersoft/community-edition/jaspersoft-studio_${finalAttrs.version}"; - hash = "sha256-llxWq2hNTlHC2slhov0VDK2mJu2NZ2xOh3Rut9XDKac="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - copyDesktopItems - ]; - - installPhase = '' - runHook preInstall - - rm -rf features/jre.linux.gtk.x86_64.feature_17.0.8.1_1/eclipsetemurin_jre - ln -s ${temurin-bin-17} features/jre.linux.gtk.x86_64.feature_17.0.8.1_1/eclipsetemurin_jre - - mkdir -p $out/share/jaspersoft-studio-community - cp -r . $out/share/jaspersoft-studio-community - - install -Dm644 icon.xpm $out/share/pixmaps/jaspersoft-studio-community.xpm - - mkdir -p $out/bin - ln -s "$out/share/jaspersoft-studio-community/Jaspersoft Studio" $out/bin/jaspersoft-studio-community - - runHook postInstall - ''; - - dontBuild = true; - dontCheck = true; - - desktopItems = [ - (makeDesktopItem { - name = "JasperSoft Studio Community"; - type = "Application"; - desktopName = "JasperSoft Studio Community"; - exec = "jaspersoft-studio-community"; - icon = "jaspersoft-studio-community"; - }) - ]; - - meta.mainProgram = "jaspersoft-studio-community"; -})