From 5a4f1b07f4618dac4b3a57c06d5bf84f3a606a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 24 Dec 2009 14:48:36 +0000 Subject: [PATCH] Adding xfontsel. A bit hacky (to work well, it requires copying its app-defaults to $HOME) As app-defaults should be installed with the libXt (maybe it's libXt which loads them), and stracing that is the place where the code looks for app-defaults (the libXt store path), I don't know of any better solution in nixpkgs by now. svn path=/nixpkgs/trunk/; revision=19092 --- pkgs/applications/misc/xfontsel/default.nix | 23 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/xfontsel/default.nix diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix new file mode 100644 index 00000000000..222d8c412ce --- /dev/null +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -0,0 +1,23 @@ +# This program used to come with xorg releases, but now I could only find it +# at http://www.x.org/releases/individual/. +# That is why this expression is not inside pkgs.xorg + +{stdenv, fetchurl, libX11, pkgconfig, libXaw, libXi, imake, xauth, libXau}: +stdenv.mkDerivation rec { + name = "xfontsel-1.0.2"; + + src = fetchurl { + url = "http://www.x.org/releases/individual/app/${name}.tar.bz2"; + sha256 = "1a86a08sf0wjrki9ydh7hr5qf6hrixc4ljlxizakjzmx20wvlrks"; + }; + + buildInputs = [libX11 pkgconfig libXaw]; + + # This will not make xfontsel find its app-defaults, but at least the $out + # directory will contain them. + # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work. + patchPhase = '' + sed -i 's@^appdefaultdir=.*@appdefaultdir='$out/share/X11/app-defaults@ configure + ''; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4798a98ef63..5e4b937cc65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6731,6 +6731,12 @@ let inherit (xlibs) libX11 libXxf86vm; }; + xfontsel = import ../applications/misc/xfontsel { + inherit fetchurl stdenv pkgconfig; + inherit (xlibs) libX11 libXi imake libXau libXaw; + inherit (xorg) xauth; + }; + fspot = import ../applications/graphics/f-spot { inherit fetchurl stdenv perl perlXMLParser pkgconfig mono libexif libjpeg sqlite lcms libgphoto2 monoDLLFixer;