b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #223133 from wegank/bombono-fix

Browse source 
bombono: migrate to scons_latest
This commit is contained in:
Weijia Wang 2023-03-26 11:41:28 +03:00 committed by GitHub
parent c87fb8fdca 3f32b063ae
commit fd66b6cdc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/video/bombono/default.nix
View file

@ -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;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -28896,9 +28896,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 { };