diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ahoviewer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/azpainter/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gcolor2/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/gimp/plugins/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gnuclad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/goxel/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gqview/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/k3d/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/openimageio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/pdfcpu/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/graphics/photoqt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/smartdeblur/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/zgv/default.nix | 2 |
15 files changed, 23 insertions, 32 deletions
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index fb06266cdc5..87bddf9099e 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -29,9 +29,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base ] ++ stdenv.lib.optional useUnrar unrar; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; postPatch = ''patchShebangs version.sh''; diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index b2060f5db31..2f636764e1f 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "Symbian9"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1hrr9lhsbjyzar3nxvli6cazr7zhyzh0p8hwpg4g9ga6njs8vi8m"; + sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 2762748bc1a..f729c9c2bba 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2"; - sha1 = "e410a52dcff3d5c6c3d448b68a026d04ccd744be"; - + sha256 = "1siv54vwx9dbfcflklvf7pkp5lk6h3nn63flg6jzifz9wp0c84q6"; }; preConfigure = '' diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fa29c979b05..0a06c42b5fc 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -48,7 +48,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; patchPhase = '' sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure @@ -141,7 +141,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { Filters/Enhance/Wavelet sharpen */ name = "wavelet-sharpen-0.1.2"; - NIX_LDFLAGS = [ "-lm" ]; + NIX_LDFLAGS = "-lm"; src = fetchurl { url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 2535f7514f1..5b6dd42e09e 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki"; }; - NIX_CFLAGS_COMPILE = [ "-Wno-error=catch-value" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=catch-value"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index e4ab5639ba6..e870df4bc6e 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; buildInputs = [ glfw3 gtk3 libpng12 ]; - NIX_LDFLAGS = [ - "-lpthread" - ]; + NIX_LDFLAGS = "-lpthread"; buildPhase = '' make release diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 205376b1257..d82238f925b 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -18,9 +18,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - NIX_LDFLAGS = [ - "-lm" - ]; + NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { description = "A fast image viewer"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index f8d50a7c798..76bb0bc1317 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0z35lglf4anfczizynjp8sd1jpix5mkmm1nh39n1v94l7ahjxsww"; + sha256 = "1chmk51xwylnjrgc6hw23x7g7cpwzgwmjc49fcah7pkd3dk1cvvr"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index d3bc8deb05e..31085cd8023 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -39,9 +39,7 @@ stdenv.mkDerivation rec { #doCheck = false; - NIX_CFLAGS_COMPILE = [ - "-Wno-deprecated-declarations" - ]; + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 7225efadebd..c743f8bd653 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "1.8.16"; + version = "1.8.17"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "Release-${version}"; - sha256 = "0isx137c6anvs1xfxi0z35v1cw855xvnq2ca0pakqqpdh0yivrps"; + sha256 = "0zq34szprgkrrayg5sl3whrsx2l6lr8nw4hdrnwv2qhn70jbi2w2"; }; outputs = [ "bin" "out" "dev" "doc" ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 8dd9ef1cb25..f31506ce733 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "13i9hz7gg82s17ky715a6czpisn4fpx2xjbmydq7j81b44x7m3vc"; + sha256 = "0a7d36hzcvj68apzc726r2vqsjyrkcynxif5laarxapm6p67g3z4"; }; - modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; + modSha256 = "0ak34wr5cbcvblndslsxdd24vfj3h02xqjqnj5amkll5iqn5mzi1"; subPackages = [ "cmd/pdfcpu" ]; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 68afdd8694b..14c49d30004 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch +{ mkDerivation, stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw, fetchpatch , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects , extra-cmake-modules, poppler, kimageformats, libarchive, libdevil }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "photoqt"; version = "1.7.1"; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 377a5ae6168..314b4007aad 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 fftw ]; - cmakeFlags = "-DUSE_SYSTEM_FFTW=ON"; + cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; meta = { homepage = https://github.com/Y-Vladimir/SmartDeblur; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index cd9d068b8ac..6d10a7cae23 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lz" ] - ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; + NIX_LDFLAGS = "-lz" + + stdenv.lib.optionalString (!isGdkQuartzBackend) " -lX11"; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 8ef705f7ef4..7b14d7750c3 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ./switch.patch ]; - patchFlags = "-p0"; + patchFlags = [ "-p0" ]; installPhase = '' mkdir -p $out/bin |