diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ciano/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/cyan/default.nix | 42 | ||||
-rw-r--r-- | pkgs/applications/graphics/epick/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/graphics/freecad/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/ideogram/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/imgbrd-grabber/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/krita/generic.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/lightburn/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/menyoki/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/pbrt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/pikopixel/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/qimgv/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/veusz/default.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/graphics/vimiv-qt/default.nix | 3 |
16 files changed, 55 insertions, 35 deletions
diff --git a/pkgs/applications/graphics/ciano/default.nix b/pkgs/applications/graphics/ciano/default.nix index dcaabed6b19c7..7b96dc1f793d5 100644 --- a/pkgs/applications/graphics/ciano/default.nix +++ b/pkgs/applications/graphics/ciano/default.nix @@ -3,14 +3,9 @@ , fetchFromGitHub , desktop-file-utils , ffmpeg -, gobject-introspection , granite , gtk , imagemagick -, libgee -, libhandy -, libsecret -, libsoup , meson , ninja , pkg-config diff --git a/pkgs/applications/graphics/cyan/default.nix b/pkgs/applications/graphics/cyan/default.nix new file mode 100644 index 0000000000000..2e59c6716b71b --- /dev/null +++ b/pkgs/applications/graphics/cyan/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, qt5 +, cmake +, pkg-config +, imagemagick +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "cyan"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "rodlie"; + repo = pname; + rev = version; + hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ imagemagick ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Image viewer and converter, designed for prepress (print) work"; + homepage = "https://github.com/rodlie/cyan"; + mainProgram = "Cyan"; + license = licenses.cecill21; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index fda56c0d8cb7a..c82f4f4d5f80f 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -4,11 +4,7 @@ , stdenv , python3 , libGL -, libX11 -, libXcursor -, libXi -, libXrandr -, libxcb +, xorg , libxkbcommon , AppKit , IOKit @@ -31,11 +27,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isLinux [ libGL - libX11 - libXcursor - libXi - libXrandr - libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXi + xorg.libXrandr + xorg.libxcb libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 17537083aaed7..0cc93bbbe8ab7 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -2,7 +2,6 @@ , stdenv , mkDerivation , fetchFromGitHub -, fetchpatch , cmake , ninja , GitPython diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index bc608c6735ffc..9c854d9ffbf38 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , vala , pkg-config , python3 diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index af1bc78ac32da..5988627d401c9 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -4,12 +4,9 @@ , wrapQtAppsHook , qtmultimedia , qttools -, qtscript , qtdeclarative , qtnetworkauth , qtbase -, autogen -, automake , makeWrapper , catch2 , nodejs diff --git a/pkgs/applications/graphics/krita/generic.nix b/pkgs/applications/graphics/krita/generic.nix index 21ba5d513751b..a9b0001847181 100644 --- a/pkgs/applications/graphics/krita/generic.nix +++ b/pkgs/applications/graphics/krita/generic.nix @@ -6,11 +6,9 @@ , openjpeg, opencolorio_1, xsimd, poppler, curl, ilmbase, libmypaint, libwebp , qtmultimedia, qtx11extras, quazip , python3Packages - , version , kde-channel , sha256 - , callPackage }: diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index fb47a304f2240..86aed684db01a 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, fetchurl, p7zip +{ lib, stdenv, fetchurl, p7zip , nss, nspr, libusb1 , qtbase, qtmultimedia, qtserialport , autoPatchelfHook, wrapQtAppsHook diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index 5615044b90e7b..1f25332e85269 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -6,8 +6,7 @@ , stdenv , withSixel ? false , libsixel -, libX11 -, libXrandr +, xorg , AppKit , withSki ? true }: @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optional withSixel libsixel - ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] + ++ lib.optionals stdenv.isLinux (with xorg; [ libX11 libXrandr ]) ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1087bba9705e8..b1c4f2258f0b0 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchurl +{ lib, fetchFromGitLab, fetchurl , boost, cmake, ffmpeg, qtbase, qtx11extras , qttools, qtxmlpatterns, qtsvg, gdal, gfortran, libXt, makeWrapper , mkDerivation, ninja, mpi, python3, tbb, libGLU, libGL diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 587a078e0660a..962f6dc97acd0 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}: +{lib, stdenv, fetchFromGitHub, flex, bison, cmake, zlib}: stdenv.mkDerivation { version = "2018-08-15"; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 52e38b23c1ff2..767b749ef736c 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,7 +1,6 @@ { mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, libdevil -}: +, extra-cmake-modules, poppler, kimageformats, libarchive}: mkDerivation rec { pname = "photoqt"; diff --git a/pkgs/applications/graphics/pikopixel/default.nix b/pkgs/applications/graphics/pikopixel/default.nix index 97a3684682d44..58a52aee4943c 100644 --- a/pkgs/applications/graphics/pikopixel/default.nix +++ b/pkgs/applications/graphics/pikopixel/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , gnustep -, gcc , llvmPackages_9 }: diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index deed3d3b88829..8e4c4805750bd 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,7 +1,6 @@ { mkDerivation , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix index d8f1ae76a887d..cb57f87fc6622 100644 --- a/pkgs/applications/graphics/veusz/default.nix +++ b/pkgs/applications/graphics/veusz/default.nix @@ -1,6 +1,5 @@ { python3Packages , qtbase -, ghostscript , wrapQtAppsHook , lib }: diff --git a/pkgs/applications/graphics/vimiv-qt/default.nix b/pkgs/applications/graphics/vimiv-qt/default.nix index 8e0caff1d1759..1b0b2a1516f0b 100644 --- a/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/pkgs/applications/graphics/vimiv-qt/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 , qt5 |