From e348ecff744236ad504607da0da5699f4bb60e92 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Mar 2005 12:02:13 +0000 Subject: [PATCH] * Don't detect an external kerberos in configure. svn path=/nixpkgs/trunk/; revision=2323 --- .../libraries/gnome/gnome-vfs/default.nix | 1 + .../gnome/gnome-vfs/no-kerberos.patch | 54 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix index 3e3f46a9abe..831a2e663cd 100644 --- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix +++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix @@ -12,4 +12,5 @@ stdenv.mkDerivation { gnomemimedata popt bzip2 perlXMLParser ]; PERL5LIB = perlXMLParser ~ "/lib/site_perl"; + patches = [./no-kerberos.patch]; } diff --git a/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch b/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch new file mode 100644 index 00000000000..e34b74bb8a1 --- /dev/null +++ b/pkgs/development/libraries/gnome/gnome-vfs/no-kerberos.patch @@ -0,0 +1,54 @@ +diff -rc gnome-vfs-2.8.4-orig/configure gnome-vfs-2.8.4/configure +*** gnome-vfs-2.8.4-orig/configure 2005-02-21 10:20:34.000000000 +0100 +--- gnome-vfs-2.8.4/configure 2005-03-02 13:00:41.000000000 +0100 +*************** +*** 128,134 **** + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +--- 128,134 ---- + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! for as_dir in $PATH + do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. +*************** +*** 306,312 **** + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +! for dir in $PATH /usr/ucb; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +--- 306,312 ---- + # So, first we look for a working echo in the user's PATH. + + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR +! for dir in $PATH; do + IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && +*************** +*** 27670,27676 **** + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! as_dummy="$PATH:/usr/kerberos/bin" + for as_dir in $as_dummy + do + IFS=$as_save_IFS +--- 27670,27676 ---- + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +! as_dummy="$PATH" + for as_dir in $as_dummy + do + IFS=$as_save_IFS