Merge pull request #262323 from sheepforce/pixinsight (885f8557) · Commits · nix / nixpkgs

pkgs/applications/graphics/pixinsight/default.nix

+72 −15

Original line number	Diff line number	Diff line
		{ stdenv, lib, requireFile, wrapQtAppsHook, autoPatchelfHook, makeWrapper, unixtools, fakeroot
		, mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig
		, dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim
		# Qt 5 subpackages
		, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt
		{ stdenv
		, lib
		, requireFile
		, wrapQtAppsHook
		, autoPatchelfHook
		, makeWrapper
		, unixtools
		, fakeroot
		, mailcap
		, libGL
		, libpulseaudio
		, alsa-lib
		, nss
		, gd
		, gst_all_1
		, nspr
		, expat
		, fontconfig
		, dbus
		, glib
		, zlib
		, openssl
		, libdrm
		, cups
		, avahi-compat
		, xorg
		, wayland
		, libudev0-shim
		, bubblewrap
		, libjpeg8
		, gdk-pixbuf
		, gtk3
		, pango
		# Qt 6 subpackages
		, qtbase
		, qtserialport
		, qtserialbus
		, qtvirtualkeyboard
		, qtmultimedia
		, qt3d
		, mlt
		, qtlocation
		, qtwebengine
		, qtquick3d
		, qtwayland
		, qtwebview
		, qtscxml
		}:

		stdenv.mkDerivation rec {
		stdenv.mkDerivation (finalAttrs: {
		pname = "pixinsight";
		version = "1.8.9-2";
		version = "1.8.9-3";

		src = requireFile rec {
		name = "PI-linux-x64-${version}-20230920-c.tar.xz";
		name = "PI-linux-x64-${finalAttrs.version}-20240619-c.tar.xz";
		url = "https://pixinsight.com/";
		hash = "sha256-g7paYTYv52XBg0w3d3YhVNrmt+iS20uobaUsvY6F3jM=";
		hash = "sha256-WZrD+X7zE1i29+YsGJ+wbIXmlVon9bczHvvRAkQXz6M=";
		message = ''
		PixInsight is available from ${url} and requires a commercial (or trial) license.
		After a license has been obtained, PixInsight can be downloaded from the software distribution
		@@ -30,6 +72,7 @@ stdenv.mkDerivation rec {
		autoPatchelfHook
		mailcap
		libudev0-shim
		bubblewrap
		];

		buildInputs = [
		@@ -53,15 +96,25 @@ stdenv.mkDerivation rec {
		wayland
		cups
		avahi-compat
		libjpeg8
		gdk-pixbuf
		gtk3
		pango
		# Qt stuff
		qt3d
		mlt
		qtbase
		qtgamepad
		#qtgamepad
		qtserialport
		qtserialbus
		qtvirtualkeyboard
		qtmultimedia
		qtlocation
		qtwebengine
		qtquick3d
		qtwayland
		qtwebview
		qtscxml
		] ++ (with xorg; [
		libX11
		libXdamage
		@@ -86,9 +139,8 @@ stdenv.mkDerivation rec {
		installPhase = ''
		mkdir -p $out/bin $out/opt/PixInsight $out/share/{applications,mime/packages,icons/hicolor}

		fakeroot script -ec "./installer \
		bwrap --bind /build /build --bind $out/opt /opt --bind /nix /nix --dev /dev fakeroot script -ec "./installer \
		--yes \
		--install-dir=$out/opt/PixInsight \
		--install-desktop-dir=$out/share/applications \
		--install-mime-dir=$out/share/mime \
		--install-icons-dir=$out/share/icons/hicolor \
		@@ -97,6 +149,11 @@ stdenv.mkDerivation rec {

		rm -rf $out/opt/PixInsight-old-0
		ln -s $out/opt/PixInsight/bin/PixInsight $out/bin/.
		ln -s $out/opt/PixInsight/bin/lib $out/lib

		# Remove signatures of plugins, as they are only working if actually installed
		# under /opt. In the Nix setup, they are causing trouble.
		find $out/opt/PixInsight/ -name "*.xsgn" -exec rm {} \;
		'';

		# Some very exotic Qt libraries are not available in nixpkgs
		@@ -118,7 +175,7 @@ stdenv.mkDerivation rec {
		];
		dontWrapQtApps = true;
		postFixup = ''
		wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString qtWrapperArgs}
		wrapProgram $out/opt/PixInsight/bin/PixInsight ${builtins.toString finalAttrs.qtWrapperArgs}
		'';

		meta = with lib; {
		@@ -131,4 +188,4 @@ stdenv.mkDerivation rec {
		hydraPlatforms = [ ];
		mainProgram = "PixInsight";
		};
		}
		})

pkgs/top-level/all-packages.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -31487,7 +31487,7 @@ with pkgs;

		pixeluvo = callPackage ../applications/graphics/pixeluvo { };

		pixinsight = libsForQt5.callPackage ../applications/graphics/pixinsight { };
		pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };

		planner = callPackage ../applications/office/planner { };

Admin message