diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-03-18 17:29:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-18 17:29:50 +0200 |
commit | d0781217d24406fb2217cab28f17163cf1badf19 (patch) | |
tree | 5db6c7635bea3dd852bdd4b2716453be8dae0c82 /pkgs/development/embedded | |
parent | 576648a75be47120fb543556fc08e93162f2c22c (diff) | |
parent | e9bb5bdbfda19d0c6847dcbe99ae3998ae864ac0 (diff) |
Merge pull request #221151 from wegank/bossa-wxgtk
bossa: migrate to wxGTK32
Diffstat (limited to 'pkgs/development/embedded')
-rw-r--r-- | pkgs/development/embedded/bossa/default.nix | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/development/embedded/bossa/default.nix b/pkgs/development/embedded/bossa/default.nix index f53e49edaed4a..58ee0642fb380 100644 --- a/pkgs/development/embedded/bossa/default.nix +++ b/pkgs/development/embedded/bossa/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: +{ lib +, stdenv +, fetchFromGitHub +, wxGTK32 +, libX11 +, readline +, darwin +}: let # BOSSA needs a "bin2c" program to embed images. @@ -24,11 +31,27 @@ stdenv.mkDerivation rec { sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "-arch x86_64" "" + ''; + nativeBuildInputs = [ bin2c ]; - buildInputs = [ wxGTK libX11 readline ]; + buildInputs = [ + wxGTK32 + libX11 + readline + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ]; - # Explicitly specify targets so they don't get stripped. - makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ]; + makeFlags = [ + "WXVERSION=3.2" + # Explicitly specify targets so they don't get stripped. + "bin/bossac" + "bin/bossash" + "bin/bossa" + ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; installPhase = '' @@ -47,6 +70,6 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.shumatech.com/web/products/bossa"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; }; } |