soqt: migrate to qt6 and pkgs/by-name (dc44762f) · Commits · nix / nixpkgs

pkgs/development/libraries/soqt/default.nix→pkgs/by-name/so/soqt/package.nix

+11 −8

Original line number	Diff line number	Diff line
		@@ -4,9 +4,9 @@
		fetchFromGitHub,
		cmake,
		coin3d,
		qtbase,
		qt6,
		testers,
		wrapQtAppsHook,
		nix-update-script,
		}:

		stdenv.mkDerivation (finalAttrs: {
		@@ -27,18 +27,21 @@ stdenv.mkDerivation (finalAttrs: {

		propagatedBuildInputs = [
		coin3d
		qtbase
		qt6.qtbase
		];

		dontWrapQtApps = true;

		passthru.tests = {
		passthru = {
		tests = {
		cmake-config = testers.hasCmakeConfigModules {
		moduleNames = [ "soqt" ];
		package = finalAttrs.finalPackage;
		nativeBuildInputs = [ wrapQtAppsHook ];
		nativeBuildInputs = [ qt6.wrapQtAppsHook ];
		};
		};
		updateScript = nix-update-script { };
		};

		meta = {
		homepage = "https://github.com/coin3d/soqt";

+1 −3

Original line number	Diff line number	Diff line
		@@ -11848,9 +11848,7 @@ self: super: with self; {

		piqp = callPackage ../development/python-modules/piqp { };

		pivy = callPackage ../development/python-modules/pivy {
		inherit (pkgs.libsForQt5) soqt;
		};
		pivy = callPackage ../development/python-modules/pivy { };

		pixcat = callPackage ../development/python-modules/pixcat { };

+0 −2

Original line number	Diff line number	Diff line
		@@ -215,8 +215,6 @@ makeScopeWithSplicing' {
		callPackage ../development/libraries/sailfish-access-control-plugin
		{ };

		soqt = callPackage ../development/libraries/soqt { };

		telepathy = callPackage ../development/libraries/telepathy/qt { };

		qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };