diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-03 14:23:43 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-02-03 14:23:43 +0000 |
commit | a617a7c2394078f10364e95fcbc3e0ee8926e0d6 (patch) | |
tree | b2810417dbb2e43cbff9a5ee13f4127ed5d9eea3 /pkgs/servers | |
parent | 0662fcbd23d1f522be6c126ff907eeeb53174dea (diff) | |
parent | b5088abe203ba6c15d2c4c22963f84e7279af5b9 (diff) | |
download | nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar.gz nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar.bz2 nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar.lz nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar.xz nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.tar.zst nixlib-a617a7c2394078f10364e95fcbc3e0ee8926e0d6.zip |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/openafs-client/default.nix | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 1ae7839643f8..330bcc2e8635 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,21 +1,20 @@ { stdenv, fetchurl, autoconf, automake, flex, yacc, - linux_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 = linux_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) ''; |