diff options
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/synergy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/wordnet/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xfe/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index c010047845fc0..ac60d9285876e 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr , xinput, curl, openssl, unzip }: with stdenv.lib; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake x11 libX11 libXi libXtst libXrandr xinput curl openssl + cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl ]; installPhase = '' diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index c70436e68f998..b244e9c1bfce9 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, tcl, tk, x11, makeWrapper}: +{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}: let version = "3.0"; in stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "08pgjvd2vvmqk3h641x63nxp7wqimb9r30889mkyfh2agc62sjbc"; }; - buildInputs = [tcl tk x11 makeWrapper]; + buildInputs = [tcl tk xlibsWrapper makeWrapper]; patchPhase = '' sed "13i#define USE_INTERP_RESULT 1" -i src/stubs.c diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 5055ac50089d2..0ea1159208f42 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: +{ stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.37"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd"; }; - buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2e690dcce0909..e677164ecf484 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: -assert enableGUI -> x11 != null && motif != null && freetype != null; +assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; |