From ef62649382ea0759a4aa8b779548fedd36a2f50a Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Wed, 1 Feb 2023 13:53:11 +0100 Subject: [PATCH] pgmodeler: 1.0.0-beta1 -> 1.0.0 This commit also changes pgmodeler to qt6, which is now supported since this release. Thanks @kilianar for the heads up! --- pkgs/applications/misc/pgmodeler/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 237e229fc54d..96cc51fceb78 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,28 +1,30 @@ { lib +, stdenv , fetchFromGitHub +, wrapQtAppsHook , pkg-config , qmake -, mkDerivation +, qtwayland , qtsvg , postgresql }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0-beta1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw="; + sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. - buildInputs = [ postgresql qtsvg ]; + buildInputs = [ postgresql qtsvg qtwayland ]; meta = with lib; { description = "A database modeling tool for PostgreSQL"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c56245676b56..1e0ec0929a99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37937,7 +37937,7 @@ with pkgs; pgadmin4 = callPackage ../tools/admin/pgadmin { }; - pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; + pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { }; physlock = callPackage ../misc/screensavers/physlock { };