diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/gnome-video-effects | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gnome-video-effects')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix index cc6f3b2ecde3..0db1aa27e778 100644 --- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/nixpkgs/pkgs/development/libraries/gnome-video-effects/default.nix @@ -9,19 +9,13 @@ stdenv.mkDerivation rec { pname = "gnome-video-effects"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1j6h98whgkcxrh30bwvnxvyqxrxchgpdgqhl0j71xz7x72dqxijd"; + sha256 = "166utGs/WoMvsuDZC0K/jGFgICylKsmt0Xr84ZLjyKg="; }; - patches = [ - # Fix effectsdir in .pc file - # https://gitlab.gnome.org/GNOME/gnome-video-effects/commit/955404195ada606819974dd63c48956f25611e14 - ./fix-pc-file.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch b/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch deleted file mode 100644 index 62b29e7d025a..000000000000 --- a/nixpkgs/pkgs/development/libraries/gnome-video-effects/fix-pc-file.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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, |