bossa: migrate to wxGTK32

+29 -8
+28 -5
pkgs/development/embedded/bossa/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, wxGTK, libX11, readline }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , wxGTK32 5 + , libX11 6 + , readline 7 + , darwin 8 + }: 2 9 3 10 let 4 11 # BOSSA needs a "bin2c" program to embed images. ··· 24 31 sha256 = "sha256-8M3MU/+Y1L6SaQ1yoC9Z27A/gGruZdopLnL1z7h7YJw="; 25 32 }; 26 33 34 + postPatch = '' 35 + substituteInPlace Makefile \ 36 + --replace "-arch x86_64" "" 37 + ''; 38 + 27 39 nativeBuildInputs = [ bin2c ]; 28 - buildInputs = [ wxGTK libX11 readline ]; 40 + buildInputs = [ 41 + wxGTK32 42 + libX11 43 + readline 44 + ] ++ lib.optionals stdenv.isDarwin [ 45 + darwin.apple_sdk.frameworks.Cocoa 46 + ]; 29 47 30 - # Explicitly specify targets so they don't get stripped. 31 - makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ]; 48 + makeFlags = [ 49 + "WXVERSION=3.2" 50 + # Explicitly specify targets so they don't get stripped. 51 + "bin/bossac" 52 + "bin/bossash" 53 + "bin/bossa" 54 + ]; 32 55 env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; 33 56 34 57 installPhase = '' ··· 47 70 ''; 48 71 homepage = "http://www.shumatech.com/web/products/bossa"; 49 72 license = licenses.bsd3; 50 - platforms = platforms.linux; 73 + platforms = platforms.unix; 51 74 }; 52 75 }
+1 -3
pkgs/top-level/all-packages.nix
··· 17531 17531 17532 17532 bloop = callPackage ../development/tools/build-managers/bloop { }; 17533 17533 17534 - bossa = callPackage ../development/embedded/bossa { 17535 - wxGTK = wxGTK30; 17536 - }; 17534 + bossa = callPackage ../development/embedded/bossa { }; 17537 17535 17538 17536 bossa-arduino = callPackage ../development/embedded/bossa/arduino.nix { }; 17539 17537