Unverified Commit 1137344f authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

wxsqlite3: 4.9.12 -> 4.10.0 (#369985)

parents 96167bdb cc1db9a6

pkgs/development/libraries/wxsqlite3/default.nix→pkgs/by-name/wx/wxsqlite3/package.nix

+10 −19
Original line number Diff line number Diff line
@@ -3,37 +3,28 @@ 
  stdenv,

  fetchFromGitHub,

  autoreconfHook,

  wxGTK,

  wxGTK32,

  sqlite,

  Cocoa,

  setfile,

  rez,

  derez,

}:



stdenv.mkDerivation rec {

  pname = "wxsqlite3";

  version = "4.9.12";

  version = "4.10.0";



  src = fetchFromGitHub {

    owner = "utelle";

    repo = "wxsqlite3";

    rev = "v${version}";

    hash = "sha256-WiOAF1yg18W4Vyyy+rzRe87GQTemvn32bexit4M/HjE=";

    hash = "sha256-1U8UF5FYKoigOLDMq1/nlchAdb8NeJhC6JluFDWNQ2M=";

  };



  nativeBuildInputs = [ autoreconfHook ];

  nativeBuildInputs = [

    autoreconfHook

  ];



  buildInputs =

    [

  buildInputs = [

    sqlite

      wxGTK

    ]

    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [

      Cocoa

      setfile

      rez

      derez

    wxGTK32

  ];



  meta = with lib; {

pkgs/development/libraries/wxsqliteplus/default.nix→pkgs/by-name/wx/wxsqliteplus/package.nix

+58 −0
Original line number Diff line number Diff line
@@ -2,62 +2,54 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  wxGTK,

  cmake,

  pkg-config,

  makeWrapper,

  wxGTK32,

  wxsqlite3,

  sqlite,

  Cocoa,

  setfile,

}:



stdenv.mkDerivation rec {

  pname = "wxsqliteplus";

  version = "0.3.6";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "guanlisheng";

    repo = "wxsqliteplus";

    rev = "v${version}";

    sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf";

    hash = "sha256-gyH1Wlmg9xQy7xm7rhKZa7BFTFFN4JQHp3CHmzMkVOg=";

  };



  postPatch = ''

    sed -i '/WX_CLEAR_ARRAY/s/$/;/' src/{createtable,sqlite3table}.cpp

  '';

  nativeBuildInputs = [

    cmake

    pkg-config

    makeWrapper

  ];



  buildInputs = [

    wxGTK

    wxGTK32

    wxsqlite3

    sqlite

  ] ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;



  makeFlags =

    [

      "LDFLAGS=-L${wxsqlite3}/lib"

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      "SETFILE=${setfile}/bin/SetFile"

  ];



  preBuild = ''

    sed -i -e 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile

    sed -i -e 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT):  $(WXSQLITEPLUS_OBJECTS) |g' Makefile

    sed -i -e 's|-lwxsqlite |-lwxcode_${

      if stdenv.hostPlatform.isDarwin then "osx_cocoau_wxsqlite3-3.2.0" else "gtk3u_wxsqlite3-3.2"

    } |g' Makefile

  '';

  cmakeFlags = [

    "-DWXSQLITE3_HAVE_CODEC=1"

  ];



  installPhase =

    lib.optionalString stdenv.hostPlatform.isDarwin ''

      mkdir -p $out/{Applications,bin}

      mv wxSQLitePlus.app $out/Applications

      makeWrapper $out/{Applications/wxSQLitePlus.app/Contents/MacOS,bin}/wxSQLitePlus

    ''

      install -D ${lib.optionalString stdenv.hostPlatform.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus

    ''

    + lib.optionalString stdenv.hostPlatform.isDarwin ''

      mkdir -p $out/Applications

      mv wxsqliteplus.app $out/Applications/

    + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

      install -Dm755 wxSQLitePlus $out/bin/wxSQLitePlus

    '';



  meta = with lib; {

    description = "Simple SQLite database browser built with wxWidgets";

    mainProgram = "wxsqliteplus";

    mainProgram = "wxSQLitePlus";

    homepage = "https://github.com/guanlisheng/wxsqliteplus";

    license = licenses.gpl3Plus;

    maintainers = [ ];

pkgs/top-level/all-packages.nix

+0 −12
Original line number Diff line number Diff line
@@ -18234,18 +18234,6 @@ with pkgs; 
    openssl = openssl_1_1;

  };













  wxsqlite3 = callPackage ../development/libraries/wxsqlite3 {













    wxGTK = wxGTK32;













    inherit (darwin.apple_sdk.frameworks) Cocoa;













    inherit (darwin.stubs) setfile rez derez;













  };

























  wxsqliteplus = callPackage ../development/libraries/wxsqliteplus {













    wxGTK = wxGTK32;













    inherit (darwin.apple_sdk.frameworks) Cocoa;













    inherit (darwin.stubs) setfile;













  };



























  xhyve = callPackage ../applications/virtualization/xhyve {















    inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;















    inherit (darwin.apple_sdk.libs) xpc;