diff options
| author | Ryan Mulligan <ryan@ryantm.com> | 2018-09-12 22:22:39 -0700 |
|---|---|---|
| committer | Ryan Mulligan <ryan@ryantm.com> | 2018-09-13 06:47:22 -0700 |
| commit | f91a79ecc86c574134f3a13ba3d0750720964230 (patch) | |
| tree | 14e31a65ca8c4c38779ff07f517329dc6caa8d05 /pkgs/applications/graphics | |
| parent | 0f2b10d1ac41c2f573fddbdf110a1ae435ffdd8a (diff) | |
| download | nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar.gz nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar.bz2 nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar.lz nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar.xz nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.tar.zst nixlib-f91a79ecc86c574134f3a13ba3d0750720964230.zip | |
treewide: fix `config.allowAliases = false` evaluation
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/krita/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/qcomicbook/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index d4ac9720e15f..0abe90e0ba73 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -3,7 +3,7 @@ , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash , boost, libraw, fftw, eigen, exiv2, libheif, lcms2, gsl, openexr, giflib -, openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase +, openjpeg, opencolorio, vc, poppler, curl, ilmbase , qtmultimedia, qtx11extras , python3 }: @@ -23,7 +23,7 @@ mkDerivation rec { karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons ki18n kitemmodels kitemviews kwindowsystem kio kcrash boost libraw fftw eigen exiv2 lcms2 gsl openexr libheif giflib - openjpeg opencolorio poppler_qt5 curl ilmbase + openjpeg opencolorio poppler curl ilmbase qtmultimedia qtx11extras python3 ] ++ lib.optional (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) vc; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index d67c8ef9b025..c37e21ec898a 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler_qt5 }: +{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: stdenv.mkDerivation rec { name = "qcomicbook-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qtbase qttools qtx11extras poppler_qt5 + qtbase qttools qtx11extras poppler ]; postInstall = '' |