From 135836b31bd68eec6a02205f2056cfc672301494 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 16 Jun 2022 10:32:07 -0700 Subject: [PATCH] wxsqliteplus: fix Darwin build --- .../libraries/wxsqliteplus/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 7cf5484bef7..fecd61bb6e5 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite, Cocoa, setfile }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -11,27 +11,32 @@ stdenv.mkDerivation rec { sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; - buildInputs = [ wxGTK wxsqlite3 sqlite ]; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_gtk2u_wxsqlite3-3.0 |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.0.0" else "gtk2u_wxsqlite3-3.0"} |g' Makefile ''; installPhase = '' - install -D wxsqliteplus $out/bin/wxsqliteplus + install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv wxsqliteplus.app $out/Applications/ ''; meta = with lib; { - homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; - platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7116ed3fc..dff02348273 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35053,6 +35053,8 @@ with pkgs; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { wxGTK = wxGTK30; + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.stubs) setfile; }; x11idle = callPackage ../tools/misc/x11idle {};