diff options
| author | Lengyel Balazs <ikervagyok@gmail.com> | 2018-12-31 04:40:47 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2019-01-04 14:38:57 +0100 |
| commit | f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9 (patch) | |
| tree | e7ce232c1bce855e2752534bd615b3a2383990a2 /pkgs/applications/graphics | |
| parent | 51d6b1bdece85e0d136e91b7cead120240698a8c (diff) | |
| download | nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.gz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.bz2 nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.lz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.xz nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.tar.zst nixlib-f4a53ff3bc54a03abdf4c90b40aec9d851a5f6d9.zip | |
treewide/xorg: replace *proto with xorgproto
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/cinepaint/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xaos/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 9c736f5ffb57..ac05e7a36312 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perlPackages, libX11, pythonPackages, gettext, intltool, babl, gegl, - glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, + glib, makedepend, xorgproto, libXmu, openexr, libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib libX11 python pygtk gettext intltool babl - gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined + gegl glib makedepend xorgproto libXmu openexr libGLU_combined libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ] ++ (with perlPackages; [ perl XMLParser ]); diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index a6f97bb5334e..182f68f3112c 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xproto, libXext -, xextproto, libXt, zlib, gettext, intltool, perl }: +{ stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext +, libXt, zlib, gettext, intltool, perl }: stdenv.mkDerivation rec { name = "xaos-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ - aalib gsl libpng libX11 xproto libXext xextproto + aalib gsl libpng libX11 xorgproto libXext libXt zlib gettext intltool perl ]; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index cfad449fb028..cd9d068b8acf 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem , ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui -, pango, libX11, xproto, zlib, poppler +, pango, libX11, xorgproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: let @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas - pango libX11 xproto zlib poppler + pango libX11 xorgproto zlib poppler ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libgnomeprint libgnomeprintui ]; |