From 3f32b063ae2df9d21643907266e1905b5232e6ad Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Mar 2023 23:28:26 +0200 Subject: [PATCH] bombono: migrate to scons_latest --- pkgs/applications/video/bombono/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index e39d09b6fe72..09d81dc98d4f 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); + postPatch = '' + substituteInPlace src/mbase/SConscript \ + --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" + ''; + nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; buildInputs = [ @@ -84,5 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://www.bombono.org/"; license = licenses.gpl2Only; maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8b6bf740426..74868da4eea3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28892,9 +28892,7 @@ with pkgs; bombadillo = callPackage ../applications/networking/browsers/bombadillo { }; - bombono = callPackage ../applications/video/bombono { - scons = sconsPackages.scons_4_1_0; - }; + bombono = callPackage ../applications/video/bombono { }; bonzomatic = callPackage ../applications/editors/bonzomatic { };