From 9e48add3e0078a992265b392818658d65854c703 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 3 Nov 2008 19:16:21 +0000 Subject: [PATCH] Try protecting FreeBSD from instntiating TinyCC svn path=/nixpkgs/trunk/; revision=13184 --- pkgs/applications/misc/xneur/default.nix | 14 ++++++++++---- pkgs/development/compilers/tinycc/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 79da06d5083e..d69a8334d43d 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -3,13 +3,19 @@ args: with args; stdenv.mkDerivation { name="xneur"; src = fetchurl { - url = "http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2"; - sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; + url = "http://dists.xneur.ru/release-0.9.2/tgz/xneur-0.9.2.tar.bz2"; + sha256 = "1zk13ixd82nq8a2rzmmk53xy2iphydf57mfb2ndfil21rkffr0jq"; }; - buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell]; + buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell + libXpm]; - preConfigure = "sed -e 's/-Werror//' -i configure"; + inherit aspell; + + preConfigure = '' + sed -e 's/-Werror//' -i configure + sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure + ''; meta = { description = "xneur is the keyboard layout switcher."; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 5c55afd63fb1..435747e12486 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, perl, texinfo }: +assert stdenv ? glibc; + let version = "0.9.24"; in stdenv.mkDerivation { name = "tinycc-${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3a1e7db3f751..93c0d43024cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8061,7 +8061,7 @@ let xneur = import ../applications/misc/xneur { inherit fetchurl stdenv pkgconfig pcre libxml2 aspell; GStreamer=gst_all.gstreamer; - inherit (xlibs) libX11; + inherit (xlibs) libX11 libXpm; inherit (gtkLibs) glib; };