From b80da194fd9dd51203d93a7c24feb49b0c1bf2aa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 19 Aug 2019 15:43:03 +0200 Subject: [PATCH] =?UTF-8?q?gnome-video-effects:=200.4.3=20=E2=86=92=200.5.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-video-effects/blob/0.5.0/NEWS#L4-6 --- .../libraries/gnome-video-effects/default.nix | 34 ++++++++++++++----- .../gnome-video-effects/fix-pc-file.patch | 11 ++++++ 2 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index cb319c125848..03799c1ef7c4 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -1,20 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: -let +{ stdenv +, fetchurl +, pkgconfig +, meson +, ninja +, gettext +, gnome3 +}: + +stdenv.mkDerivation rec { pname = "gnome-video-effects"; - version = "0.4.3"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + version = "0.5.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06c2f1kihyhawap1s3zg5w7q7fypsybkp7xry4hxkdz4mpsy0zjs"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + 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"; }; }; diff --git a/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch new file mode 100644 index 000000000000..62b29e7d025a --- /dev/null +++ b/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch @@ -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,