From 77e8114f7229e120ef3b13fa936270469295e25c Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 12:14:42 +0200 Subject: [PATCH] vapoursynth-mvtools: move to by-name and reformat --- .../va/vapoursynth-mvtools/package.nix} | 30 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 21 insertions(+), 11 deletions(-) rename pkgs/{development/libraries/vapoursynth-mvtools/default.nix => by-name/va/vapoursynth-mvtools/package.nix} (51%) diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/by-name/va/vapoursynth-mvtools/package.nix similarity index 51% rename from pkgs/development/libraries/vapoursynth-mvtools/default.nix rename to pkgs/by-name/va/vapoursynth-mvtools/package.nix index cafac41abb1e..41ae1a11ccee 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/by-name/va/vapoursynth-mvtools/package.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, - vapoursynth, nasm, fftwFloat +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + autoreconfHook, + vapoursynth, + nasm, + fftwFloat, }: stdenv.mkDerivation rec { @@ -7,15 +14,20 @@ stdenv.mkDerivation rec { version = "24"; src = fetchFromGitHub { - owner = "dubhater"; - repo = "vapoursynth-mvtools"; - rev = "v${version}"; - hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ="; + owner = "dubhater"; + repo = "vapoursynth-mvtools"; + rev = "v${version}"; + hash = "sha256-bEifU1PPNOBr6o9D6DGIzTaG4xjygBxkQYnZxd/4SwQ="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; buildInputs = [ - nasm vapoursynth fftwFloat + nasm + vapoursynth + fftwFloat ]; configureFlags = [ "--libdir=$(out)/lib/vapoursynth" ]; @@ -23,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of filters for motion estimation and compensation"; homepage = "https://github.com/dubhater/vapoursynth-mvtools"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdb9a12185f0..58e056369fe4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19842,8 +19842,6 @@ with pkgs; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; - vapoursynth-mvtools = callPackage ../development/libraries/vapoursynth-mvtools { }; - vmmlib = callPackage ../development/libraries/vmmlib { inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; };