Unverified Commit 4be1f0c9 authored by Toma's avatar Toma Committed by GitHub
Browse files

pkgs/application/graphics: use callPackage (#406042)

parents 2004dd9e 702e8e6f

pkgs/applications/graphics/cloudcompare/default.nix

+7 −8
Original line number Diff line number Diff line 
{

  lib,

  mkDerivation,

  stdenv,

  fetchFromGitHub,

  makeDesktopItem,

  copyDesktopItems,
@@ -14,15 +14,13 @@ 
  laszip,

  mpfr,

  pcl,

  qtbase,

  qtsvg,

  qttools,

  libsForQt5,

  tbb,

  xercesc,

  wrapGAppsHook3,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "cloudcompare";

  version = "2.13.2";
@@ -39,6 +37,7 @@ mkDerivation rec { 
    eigen # header-only

    wrapGAppsHook3

    copyDesktopItems

    libsForQt5.wrapQtAppsHook

  ];



  buildInputs = [
@@ -50,9 +49,9 @@ mkDerivation rec { 
    laszip

    mpfr

    pcl

    qtbase

    qtsvg

    qttools

    libsForQt5.qtbase

    libsForQt5.qtsvg

    libsForQt5.qttools

    tbb

    xercesc

  ];

pkgs/applications/graphics/djview/default.nix

+5 −6
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  mkDerivation,

  fetchurl,

  autoconf,

  automake,

  libtool,

  pkg-config,

  djvulibre,

  qtbase,

  qttools,

  libsForQt5,

  xorg,

  libtiff,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "djview";

  version = "4.12";
@@ -33,12 +31,13 @@ mkDerivation rec { 
    automake

    libtool

    pkg-config

    qttools

    libsForQt5.qttools

    libsForQt5.wrapQtAppsHook

  ];



  buildInputs = [

    djvulibre

    qtbase

    libsForQt5.qtbase

    xorg.libXt

    libtiff

  ];

pkgs/applications/graphics/eddy/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
  lib,

  jre,

  qt5,

  wrapQtAppsHook,

}:



python3Packages.buildPythonApplication rec {
@@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec { 


  propagatedBuildInputs = [

    qt5.qtbase

    wrapQtAppsHook

    qt5.wrapQtAppsHook

    python3Packages.setuptools

    python3Packages.rfc3987

    python3Packages.jpype1

pkgs/applications/graphics/evilpixie/default.nix

+3 −4
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
  meson,

  ninja,

  pkg-config,

  wrapQtAppsHook,

  qtbase,

  libsForQt5,

  libpng,

  giflib,

  libjpeg,
@@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { 
    meson

    ninja

    pkg-config

    wrapQtAppsHook

    libsForQt5.wrapQtAppsHook

  ];



  buildInputs = [

    qtbase

    libsForQt5.qtbase

    libpng

    giflib

    libjpeg

pkgs/applications/graphics/fontmatrix/default.nix

+9 −7
Original line number Diff line number Diff line 
{

  lib,

  mkDerivation,

  stdenv,

  fetchFromGitHub,

  cmake,

  qttools,

  qtwebkit,

  libsForQt5,

}:



mkDerivation rec {

stdenv.mkDerivation rec {

  pname = "fontmatrix";

  version = "0.9.100";
@@ -19,11 +18,14 @@ mkDerivation rec { 
  };



  buildInputs = [

    qttools

    qtwebkit

    libsForQt5.qttools

    libsForQt5.qtwebkit

  ];



  nativeBuildInputs = [ cmake ];

  nativeBuildInputs = [

    cmake

    libsForQt5.wrapQtAppsHook

  ];



  meta = with lib; {

    description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";