diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 67ff2ec55411..725447966955 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: +{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }: let version = "1.33"; @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { md5 = "fb089ba73add411b08a6560eeb51742d"; }; - buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ]; + buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ]; - doCheck = false; + preConfigure = '' + sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h + ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 76cc1d5c3d29..bfe7c68dd3e3 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: let version = "1.7.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "b5897e9c664967f5042e57070037ff18"; }; - buildInputs = [ x11 ]; + buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index e8961621cab1..c0946d79e3c6 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, x11 }: +{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, mesa, libXft }: let version = "1.6.9"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { md5 = "8ab8274237431865f57b2f5596374a65"; }; - buildInputs = [ x11 ]; + buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30eace9ef806..560aacb4b760 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -799,8 +799,13 @@ let fortune = callPackage ../tools/misc/fortune { }; - fox = callPackage ../development/libraries/fox/default.nix { }; - fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fox = callPackage ../development/libraries/fox/default.nix { + libpng = libpng12; + }; + + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { + libpng = libpng12; + }; fping = callPackage ../tools/networking/fping {}; @@ -8217,7 +8222,9 @@ let xen = callPackage ../applications/virtualization/xen { }; - xfe = callPackage ../applications/misc/xfe { }; + xfe = callPackage ../applications/misc/xfe { + fox = fox_1_6; + }; xfig = callPackage ../applications/graphics/xfig { };