about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-08-19 15:43:03 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-08-19 19:39:17 +0200
commitb80da194fd9dd51203d93a7c24feb49b0c1bf2aa (patch)
tree4052e8aabd5873401db82dc7b4affb22d82f4d57 /pkgs
parentd4861c9edeeb7860bdee16cd73a01ea291d436d4 (diff)
downloadnixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar.gz
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar.bz2
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar.lz
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar.xz
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.tar.zst
nixlib-b80da194fd9dd51203d93a7c24feb49b0c1bf2aa.zip
gnome-video-effects: 0.4.3 → 0.5.0
https://gitlab.gnome.org/GNOME/gnome-video-effects/blob/0.5.0/NEWS#L4-6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/gnome-video-effects/default.nix34
-rw-r--r--pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch11
2 files changed, 37 insertions, 8 deletions
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,