cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #194462 from trofi/ghostscript-without-xlibsWrapper

Browse source 
ghostscript: use xorg.* packages directly instead of xlibsWrapper ind…
This commit is contained in:
Sergei Trofimovich 2022-10-08 07:29:23 +01:00 committed by GitHub
commit 790e625cd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/misc/ghostscript/default.nix
View file

@ -2,7 +2,7 @@
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
, libiconv, ijs, lcms2, callPackage, bash, buildPackages, openjpeg , libiconv, ijs, lcms2, callPackage, bash, buildPackages, openjpeg
, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups
, x11Support ? cupsSupport, xlibsWrapper # with CUPS, X11 only adds very little , x11Support ? cupsSupport, xorg # with CUPS, X11 only adds very little
}: }:
let let
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
libiconv ijs lcms2 bash openjpeg libiconv ijs lcms2 bash openjpeg
] ]
++ lib.optional x11Support xlibsWrapper ++ lib.optionals x11Support [ xorg.libICE xorg.libX11 xorg.libXext xorg.libXt ]
++ lib.optional cupsSupport cups ++ lib.optional cupsSupport cups
; ;