Unverified Commit 77cbf2a1 authored by TomaSajt's avatar TomaSajt
Browse files

trimage: migrate to pkgs/by-name

parent e3893e5c
Loading
Loading
Loading
Loading
+14 −12
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchFromGitHub
{
  lib,
  stdenv,
  fetchFromGitHub,

, python3
, installShellFiles
, makeWrapper
, wrapQtAppsHook
  python3,
  installShellFiles,
  makeWrapper,
  qt5,

, advancecomp
, jpegoptim
, optipng
, pngcrush
  advancecomp,
  jpegoptim,
  optipng,
  pngcrush,
}:

let
  pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);

  binPath = lib.makeBinPath [
    advancecomp
    jpegoptim
@@ -36,7 +38,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [
    installShellFiles
    makeWrapper
    wrapQtAppsHook
    qt5.wrapQtAppsHook
  ];

  dontWrapQtApps = true;
+0 −2
Original line number Diff line number Diff line
@@ -1143,8 +1143,6 @@ with pkgs;
    inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreAudio CoreGraphics Foundation IOKit MediaPlayer Security;
  };
  trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
  ufolint = with python3Packages; toPythonApplication ufolint;
  valeronoi = qt6Packages.callPackage ../tools/misc/valeronoi { };