Merge pull request #86969 from prusnak/wxsqlite

wxsqlite3: 3.3.1 -> 4.5.1
This commit is contained in:
Graham Christensen 2020-05-07 07:11:42 -04:00 committed by GitHub
commit c2d814880a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions

View File

@ -1,20 +1,23 @@
{ stdenv, fetchFromGitHub, wxGTK, sqlite { stdenv
, darwin }: , fetchFromGitHub
, autoreconfHook
, wxGTK
, sqlite
, darwin
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wxsqlite3"; pname = "wxsqlite3";
version = "3.3.1"; version = "4.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "utelle"; owner = "utelle";
repo = "wxsqlite3"; repo = "wxsqlite3";
rev = "v${version}"; rev = "v${version}";
sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3";
}; };
preBuild = stdenv.lib.optionalString stdenv.isDarwin '' nativeBuildInputs = [ autoreconfHook ];
cp build28/Info.plist.in build28/wxmac.icns build/
'';
buildInputs = [ wxGTK sqlite ] buildInputs = [ wxGTK sqlite ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ];

View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
owner = "guanlisheng"; owner = "guanlisheng";
repo = "wxsqliteplus"; repo = "wxsqliteplus";
rev = "v${version}"; rev = "v${version}";
sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1"; sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf";
}; };
buildInputs = [ wxGTK wxsqlite3 sqlite ]; buildInputs = [ wxGTK wxsqlite3 sqlite ];
@ -24,12 +24,11 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin install -D wxsqliteplus $out/bin/wxsqliteplus
cp wxsqliteplus $out/bin/
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://guanlisheng.com/"; homepage = "https://github.com/guanlisheng/wxsqliteplus";
description = "A simple SQLite database browser built with wxWidgets"; description = "A simple SQLite database browser built with wxWidgets";
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ vrthra ]; maintainers = with maintainers; [ vrthra ];