diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-15 10:36:38 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-16 11:37:19 +0000 |
| commit | d435710923ac6e6f9fc155534800745004f2ce93 (patch) | |
| tree | 386f9401476f96bdc6ec25173a090198942b5d5b /nixpkgs/pkgs/development/libraries/mlt | |
| parent | c725f0011e91ae49d351b981690eb66b862b6104 (diff) | |
| parent | 3239fd2b8f728106491154b44625662e10259af2 (diff) | |
| download | nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.gz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.bz2 nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.lz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.xz nixlib-d435710923ac6e6f9fc155534800745004f2ce93.tar.zst nixlib-d435710923ac6e6f9fc155534800745004f2ce93.zip | |
Merge commit '3239fd2b8f728106491154b44625662e10259af2'
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/mlt')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mlt/default.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/mlt/qt-5.nix | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/mlt/default.nix b/nixpkgs/pkgs/development/libraries/mlt/default.nix index b73289ca82ff..d3bcaa2658ba 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/default.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, makeWrapper , SDL, ffmpeg_4, frei0r, libjack2, libdv, libsamplerate, libexif , libvorbis, libxml2, movit, pkg-config, sox, fftw, opencv4, SDL2 -, gtk2, genericUpdater, common-updater-scripts, libebur128 +, gtk2, gitUpdater, libebur128 , jack2, ladspa-sdk, swig, which, ncurses , enablePython ? false, python3 }: @@ -51,9 +51,8 @@ stdenv.mkDerivation rec { sed -i ${outPythonPath}/mlt/__init__.py -e "s|return importlib.import_module('_mlt')|return importlib.import_module('mlt._mlt')|g" ''; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 948de303cefa..5c58aa4f8aec 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -18,8 +18,7 @@ , vid-stab , opencv3 , ladspa-sdk -, genericUpdater -, common-updater-scripts +, gitUpdater , ladspaPlugins , mkDerivation , which @@ -70,9 +69,8 @@ mkDerivation rec { inherit ffmpeg; }; - passthru.updateScript = genericUpdater { + passthru.updateScript = gitUpdater { inherit pname version; - versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; rev-prefix = "v"; }; |