From f1f98cc18fd017bf3afde0a36bb65ead46ce55c3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 8 Oct 2022 16:19:49 +0200 Subject: [PATCH] wxsqlite3: 4.8.2 -> 4.9.0 --- pkgs/development/libraries/wxsqlite3/default.nix | 10 ++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 81a0662b4371..3b1c9ff22e8f 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,25 +8,23 @@ , setfile , rez , derez -, wxmac }: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.8.2"; + version = "4.9.0"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - hash = "sha256-YoeCUyWVxpXY1QCTNONpv2QjV3rLZY84P6D3pXiWXo0="; + hash = "sha256-9WnXaMpKzqJhdfT7ScOhULbOwJsmuiS0IpYDArWq82s="; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ sqlite ] - ++ lib.optionals (!stdenv.isDarwin) [ wxGTK ] - ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez wxmac ]; + buildInputs = [ sqlite wxGTK ] + ++ lib.optionals (stdenv.isDarwin) [ Cocoa setfile rez derez ]; meta = with lib; { homepage = "https://utelle.github.io/wxsqlite3/"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cfdc1f70e02..7fd641ef4114 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36895,7 +36895,7 @@ with pkgs; }; wxsqlite3 = callPackage ../development/libraries/wxsqlite3 { - wxGTK = wxGTK30; + wxGTK = wxGTK32; inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.stubs) setfile rez derez; };