Merge pull request #66934 from jtojnar/gnome-video-effects-0.5.0

gnome-video-effects: 0.4.3 → 0.5.0
This commit is contained in:
worldofpeace 2019-08-19 14:11:13 -04:00 committed by GitHub
commit 80f4d61534
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 61 additions and 31 deletions

View file

@ -351,8 +351,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-autoar = callPackage ./misc/gnome-autoar { };
gnome-video-effects = callPackage ./misc/gnome-video-effects { };
gnome-packagekit = callPackage ./misc/gnome-packagekit { };
} // lib.optionalAttrs (config.allowAliases or true) {
#### Legacy aliases
@ -392,6 +390,8 @@ lib.makeScope pkgs.newScope (self: with self; {
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19
defaultIconTheme = adwaita-icon-theme;
gtk = gtk3;
gtkmm = gtkmm3;

View file

@ -1,29 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
let
pname = "gnome-video-effects";
version = "0.4.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs";
};
nativeBuildInputs = [ pkgconfig intltool ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; {
description = "A collection of GStreamer effects to be used in different GNOME Modules";
homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,46 @@
{ stdenv
, fetchurl
, pkgconfig
, meson
, ninja
, gettext
, gnome3
}:
stdenv.mkDerivation rec {
pname = "gnome-video-effects";
version = "0.5.0";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd";
};
patches = [
# Fix effectsdir in .pc file
# https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14
./fix-pc-file.patch
];
nativeBuildInputs = [
meson
ninja
pkgconfig
gettext
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
meta = with stdenv.lib; {
description = "A collection of GStreamer effects to be used in different GNOME Modules";
homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
platforms = platforms.linux;
maintainers = gnome3.maintainers;
license = licenses.gpl2;
};
}

View file

@ -0,0 +1,11 @@
--- a/meson.build
+++ b/meson.build
@@ -17,7 +17,7 @@
# Can't use pkgconfig helper https://github.com/mesonbuild/meson/issues/2253
conf = configuration_data()
conf.set('prefix', prefix)
-conf.set('datarootdir', pkgdatadir)
+conf.set('datarootdir', datadir)
conf.set('VERSION', meson.project_version())
pkg = configure_file(configuration: conf,

View file

@ -9489,6 +9489,8 @@ in
gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { };
gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { };
gnum4 = callPackage ../development/tools/misc/gnum4 { };
m4 = gnum4;