b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix bugs and improve pkgs/servers/openafs-client

Browse source 
svn path=/nixpkgs/trunk/; revision=19750
This commit is contained in:
Marco Maggesi 2010-02-01 16:27:35 +00:00
parent 8beaa7ab63
commit f278489e98
2 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/servers/openafs-client/default.nix
View file

@ -1,21 +1,20 @@
{ stdenv, fetchurl, autoconf, automake, flex, yacc,
kernel_2_6_28, glibc, ncurses, perl, krb5 }:
kernel, glibc, ncurses, perl, krb5 }:
assert stdenv.isLinux;
let
pname = "openafs";
version = "1.4.11";
name = "${pname}-${version}";
name = "${pname}-${version}-${kernel.version}";
webpage = http://www.openafs.org;
kernel = kernel_2_6_28;
in
stdenv.mkDerivation rec {
inherit name;
src = fetchurl {
url = "${webpage}/dl/${pname}/${version}/${name}-src.tar.gz";
url = "${webpage}/dl/${pname}/${version}/${pname}-${version}-src.tar.gz";
sha256 = "ea5377119fd7b5317428644fa427066b9edbde395d997943a448426742d2c5c9";
};
@ -26,20 +25,6 @@ stdenv.mkDerivation rec {
replace_usrbinperl = ./replace-usrbinperl;
replace_usrsrc = ./replace-usrsrc;
/*
xargs -IXX -L1 -a ${replace_usrbinenv} \
substituteInPlace XX --replace "/usr/bin/env" $(type -tp env)
xargs -IXX -L1 -a ${replace_usrinclude} \
substituteInPlace XX --replace "/usr/include" "${glibc}/include"
xargs -IXX -L1 -a ${replace_usrbinperl} \
substituteInPlace XX --replace "/usr/bin/perl" $(type -tp perl)
xargs -IXX -L1 -a ${replace_usrsrc} \
substituteInPlace XX --replace "/usr/src" "$TMP"
*/
configurePhase = ''
ln -s ${kernel}/lib/modules/*/build $TMP/linux
@ -63,9 +48,9 @@ stdenv.mkDerivation rec {
./configure \
--prefix=$out \
--with-linux-kernel-build=$TMP/linux \
--with-afs-sysname=amd64_linux26 \
--with-krb5-conf=${krb5}/bin/krb5-config \
--sysconfdir=/etc/static
#--with-afs-sysname=amd64_linux26 \
substituteInPlace src/pinstall/install.c --replace "/bin/cp" $(type -tp cp)
'';

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

@ -2936,11 +2936,6 @@ let
inherit fetchurl stdenv;
};
openafsClient = import ../servers/openafs-client {
inherit stdenv fetchurl autoconf automake flex yacc;
inherit kernel_2_6_28 glibc ncurses perl krb5;
};
openocd = import ../development/tools/misc/openocd {
inherit fetchurl stdenv libftdi;
};
@ -5733,6 +5728,11 @@ let
inherit stdenv fetchurl kernel xlibs gtkLibs zlib;
};
openafsClient = import ../servers/openafs-client {
inherit stdenv fetchurl autoconf automake flex yacc;
inherit kernel glibc ncurses perl krb5;
};
wis_go7007 = import ../os-specific/linux/wis-go7007 {
inherit fetchurl stdenv kernel ncurses fxload;
};