colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try protecting FreeBSD from instntiating TinyCC

Browse Source 
svn path=/nixpkgs/trunk/; revision=13184
This commit is contained in:
Michael Raskin 2008-11-03 19:16:21 +00:00
parent 4e3a66df31
commit 9e48add3e0
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/xneur/default.nix
View File

@ -3,13 +3,19 @@ args: with args;
stdenv.mkDerivation { stdenv.mkDerivation {
name="xneur"; name="xneur";
src = fetchurl { src = fetchurl {
url = "http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2"; url = "http://dists.xneur.ru/release-0.9.2/tgz/xneur-0.9.2.tar.bz2";
sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8"; 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 = { meta = {
description = "xneur is the keyboard layout switcher."; description = "xneur is the keyboard layout switcher.";

2
pkgs/development/compilers/tinycc/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchurl, perl, texinfo }: { stdenv, fetchurl, perl, texinfo }:
assert stdenv ? glibc;
let version = "0.9.24"; in let version = "0.9.24"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tinycc-${version}"; name = "tinycc-${version}";

2
pkgs/top-level/all-packages.nix
View File

@ -8061,7 +8061,7 @@ let
xneur = import ../applications/misc/xneur { xneur = import ../applications/misc/xneur {
inherit fetchurl stdenv pkgconfig pcre libxml2 aspell; inherit fetchurl stdenv pkgconfig pcre libxml2 aspell;
GStreamer=gst_all.gstreamer; GStreamer=gst_all.gstreamer;
inherit (xlibs) libX11; inherit (xlibs) libX11 libXpm;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
}; };