trimage: migrate to pkgs/by-name
This commit is contained in:
parent
e3893e5c3c
commit
77cbf2a1b1
@ -1,20 +1,22 @@
|
||||
{ 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;
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user