diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/by-name/ci/ciano/package.nix similarity index 57% rename from pkgs/applications/graphics/ciano/default.nix rename to pkgs/by-name/ci/ciano/package.nix index 1106bd9581942..b223970625a97 100644 --- a/pkgs/applications/graphics/ciano/default.nix +++ b/pkgs/by-name/ci/ciano/package.nix @@ -1,27 +1,31 @@ -{ lib -, stdenv -, fetchFromGitHub -, desktop-file-utils -, ffmpeg -, granite -, gtk -, imagemagick -, meson -, ninja -, pkg-config -, python -, vala -, wrapGAppsHook3 +{ + lib, + desktop-file-utils, + fetchFromGitHub, + ffmpeg, + gtk3, + imagemagick, + meson, + ninja, + pantheon, + pkg-config, + python3, + stdenv, + vala, + wrapGAppsHook3, }: -stdenv.mkDerivation rec { +let + inherit (pantheon) granite; +in +stdenv.mkDerivation (finalAttrs: { pname = "ciano"; version = "0.2.4"; src = fetchFromGitHub { owner = "robertsanseries"; - repo = pname; - rev = version; + repo = "ciano"; + rev = finalAttrs.version; hash = "sha256-nubm6vBWwsHrrmvFAL/cIzYPxg9B1EhnpC79IJMNuFY="; }; @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python + python3 vala wrapGAppsHook3 ]; @@ -39,33 +43,36 @@ stdenv.mkDerivation rec { ffmpeg imagemagick granite - gtk + gtk3 ]; + dontWrapGApps = true; + + strictDeps = true; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; - dontWrapGApps = true; - - postFixup = let - binPath = lib.makeBinPath [ - ffmpeg - imagemagick - ]; - in + postFixup = + let + binPath = lib.makeBinPath [ + ffmpeg + imagemagick + ]; + in '' wrapProgram $out/bin/com.github.robertsanseries.ciano \ --prefix PATH : ${binPath} "''${gappsWrapperArgs[@]}" ln -s $out/bin/com.github.robertsanseries.ciano $out/bin/ciano ''; - meta = with lib; { + meta = { homepage = "https://github.com/robertsanseries/ciano"; description = "Multimedia file converter focused on simplicity"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83ffc290616cf..fe1854a7104a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4189,12 +4189,6 @@ with pkgs; burpsuite = callPackage ../tools/networking/burpsuite { }; - ciano = callPackage ../applications/graphics/ciano { - inherit (pantheon) granite; - python = python3; - gtk = gtk3; - }; - c3d = callPackage ../applications/graphics/c3d { inherit (darwin.apple_sdk.frameworks) Cocoa; };