diff options
author | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-17 16:11:16 -0400 |
---|---|---|
committer | Matthew Bauer <matthew.bauer@obsidian.systems> | 2018-07-18 23:25:20 -0400 |
commit | 76999cc40e6c4cbfe817b3b6f125ece999ae9b73 (patch) | |
tree | 0325a27e51eb7bed006c1ef958e6312ac1d995c4 /pkgs/applications/graphics | |
parent | d7d31fea7e7eef8ff4495e75be5dcbb37fb215d0 (diff) |
treewide: remove aliases in nixpkgs
This makes the command ‘nix-env -qa -f. --arg config '{skipAliases = true;}'’ work in Nixpkgs. Misc... - qtikz: use libsForQt5.callPackage This ensures we get the right poppler. - rewrites: docbook5_xsl -> docbook_xsl_ns docbook_xml_xslt -> docbook_xsl diffpdf: fixup
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/draftsight/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/exrdisplay/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/ktikz/default.nix | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index d817424c45258..30101bb947709 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, - dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, + dbus, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: @@ -71,7 +71,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils - dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 + dbus alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcomposite ]; diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 34e7b1f23088f..562fb8c11dc39 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, ctl }: stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 8817071e98431..4b3a423a8ce23 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }: +{ stdenv, fetchFromGitHub, gettext, poppler, qt5 , pkgconfig }: # Warning: You will also need a working pdflatex installation containing # at least auctex and pgf. @@ -64,8 +64,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext qt5.full poppler_qt5 ]; + buildInputs = [ gettext qt5.full poppler ]; enableParallelBuilding = true; } - |