From 58cbbb74136947b8079e687bfc67dd0abaf8b11d Mon Sep 17 00:00:00 2001 From: Noa Virellia Date: Wed, 4 Jun 2025 09:27:11 +0800 Subject: [PATCH 1/3] sqlitestudio-plugins: init at 3.4.17 --- .../sq/sqlitestudio-plugins/package.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 pkgs/by-name/sq/sqlitestudio-plugins/package.nix diff --git a/pkgs/by-name/sq/sqlitestudio-plugins/package.nix b/pkgs/by-name/sq/sqlitestudio-plugins/package.nix new file mode 100644 index 000000000000..71ba50a2c3e8 --- /dev/null +++ b/pkgs/by-name/sq/sqlitestudio-plugins/package.nix @@ -0,0 +1,35 @@ +{ + stdenv, + lib, + python3, + + sqlitestudio, +}: +stdenv.mkDerivation { + pname = "sqlitestudio-plugins"; + + inherit (sqlitestudio) + version + src + nativeBuildInputs + buildInputs + ; + + postConfigure = '' + uic ./SQLiteStudio3/guiSQLiteStudio/mainwindow.ui -o ./SQLiteStudio3/guiSQLiteStudio/ui_mainwindow.h + ''; + + qmakeFlags = [ + "./Plugins" + "PYTHON_VERSION=${python3.pythonVersion}" + "INCLUDEPATH+=${python3}/include/python${python3.pythonVersion}" + ]; + + # bin/ld: final link failed: bad value + enableParallelBuilding = false; + + meta = sqlitestudio.meta // { + description = "Official plugins for SQLiteStudio, a free, open source, multi-platform SQLite database manager"; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; + }; +} From c595023bee8ec5df55d0a67ba51d41515cd48970 Mon Sep 17 00:00:00 2001 From: Noa Virellia Date: Wed, 4 Jun 2025 09:27:20 +0800 Subject: [PATCH 2/3] sqlitestudio: include official plugins --- pkgs/by-name/sq/sqlitestudio/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 9972a052e431..03069aeeec0b 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -8,6 +8,9 @@ python3, copyDesktopItems, makeDesktopItem, + + sqlitestudio-plugins, + includeOfficialPlugins ? lib.meta.availableOn stdenv.hostPlatform sqlitestudio-plugins, }: stdenv.mkDerivation rec { pname = "sqlitestudio"; @@ -41,7 +44,14 @@ stdenv.mkDerivation rec { qtscript ]); - qmakeFlags = [ "./SQLiteStudio3" ]; + qmakeFlags = + [ + "./SQLiteStudio3" + "DEFINES+=NO_AUTO_UPDATES" + ] + ++ lib.optionals includeOfficialPlugins [ + "DEFINES+=PLUGINS_DIR=${sqlitestudio-plugins}/lib/sqlitestudio" + ]; desktopItems = [ (makeDesktopItem { From 939e7073d3de41207f79c5d408c4478550454fee Mon Sep 17 00:00:00 2001 From: Noa Virellia Date: Fri, 6 Jun 2025 16:25:55 +0800 Subject: [PATCH 3/3] sqlitestudio: specify the license more precisely as gpl3only rather than gpl3 --- pkgs/by-name/sq/sqlitestudio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sq/sqlitestudio/package.nix b/pkgs/by-name/sq/sqlitestudio/package.nix index 03069aeeec0b..7131d99b8fd4 100644 --- a/pkgs/by-name/sq/sqlitestudio/package.nix +++ b/pkgs/by-name/sq/sqlitestudio/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "Free, open source, multi-platform SQLite database manager"; homepage = "https://sqlitestudio.pl/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Only; mainProgram = "sqlitestudio"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ asterismono ];