diff options
author | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-01-05 07:13:19 -0500 |
commit | 139f8949e6a5898aa8f245b49c18a6c523dce24e (patch) | |
tree | 07eaae3112af64386c3dea40e27a15a85f798f76 /pkgs/servers | |
parent | 010e63c69d4e240d01e319af392fbf6b03cf7490 (diff) | |
parent | ac2035287fbec30d92165fd3839d1bf71b8edd47 (diff) | |
download | nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.gz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.bz2 nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.lz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.xz nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.tar.zst nixlib-139f8949e6a5898aa8f245b49c18a6c523dce24e.zip |
Merge branch 'merge-kernel-builds' into upstream-master
This is a second attempt at unifying the generic and manual-config kernel builds (see #412 for the last time). The set of working kernel packages is a superset of those that work on master, and as the only objection last time was the size of the $dev closure and now both $out and $dev combined are 20M smaller than $out on master (see message for ac2035287fbec30d92165fd3839d1bf71b8edd47), this should be unobjectionable. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/openafs-client/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 462ecadd346d..ba0b80fc61e8 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc, - kernelDev, glibc, ncurses, perl, krb5 }: + kernel, glibc, ncurses, perl, krb5 }: assert stdenv.isLinux; stdenv.mkDerivation { - name = "openafs-1.6.1-${kernelDev.version}"; + name = "openafs-1.6.1-${kernel.version}"; src = fetchurl { url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ autoconf automake flex yacc ncurses perl which ]; preConfigure = '' - ln -s ${kernelDev}/lib/modules/*/build $TMP/linux + ln -s ${kernel.dev}/lib/modules/*/build $TMP/linux patchShebangs . for i in `grep -l -R '/usr/\(include\|src\)' .`; do |