alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Making xfe find and load icons fine

Browse source 
I added more dependencies to fox, for that.
I tried to add mesa too, but it wasn't trivial for it to find it, so
I took it out.
This commit is contained in:
Lluís Batlle i Rossell 2013-05-16 23:35:48 +02:00
parent c06c636604
commit 6a4350b68f
4 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/xfe/default.nix
View file

@ -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;

4
pkgs/development/libraries/fox/default.nix
View file

@ -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;

4
pkgs/development/libraries/fox/fox-1.6.nix
View file

@ -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;

13
pkgs/top-level/all-packages.nix
View file

@ -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 { };