diff options
author | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
commit | 4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3 (patch) | |
tree | 9ba4a2c3ffcee27f93accfb9115bd44bf49a0a2c /pkgs/os-specific/linux/cryptodev/default.nix | |
parent | f8fb55b4cc2809dc02c9ca392802716d78d5f4c3 (diff) | |
download | nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.gz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.bz2 nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.lz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.xz nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.tar.zst nixpkgs-4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3.zip |
Partially revert my recent kernelPackages changes
First, pass in `self' again so that overriding works properly (thanks for pointing that out, @edolstra) Second, instead of having linuxPackages*.kernel mean something different inside the set and out, add a new attribute linuxPackages*.kernelDev, which for the generic kernel is simply linuxPackages*.kernel but for the manual-config kernel is the `dev' output (which has the build tree, source tree, etc.) The second change required trivial modifications in a bunch of expressions, I verified that all of the linuxPackages* sets defined in all-packages.nix have the same drv paths before and after the change. Signed-off-by: Shea Levy <shea@shealevy.com>
Diffstat (limited to 'pkgs/os-specific/linux/cryptodev/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/cryptodev/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index b9e5690e80e..e80256f7299 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, stdenv, kernel, onlyHeaders ? false }: +{ fetchurl, stdenv, kernelDev, onlyHeaders ? false }: stdenv.mkDerivation rec { pname = "cryptodev-linux-1.5"; - name = "${pname}-${kernel.version}"; + name = "${pname}-${kernelDev.version}"; src = fetchurl { url = "http://download.gna.org/cryptodev-linux/${pname}.tar.gz"; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; buildPhase = if !onlyHeaders then '' - make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ + make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \ SUBDIRS=`pwd` INSTALL_PATH=$out '' else ":"; installPhase = stdenv.lib.optionalString (!onlyHeaders) '' - make -C ${kernel}/lib/modules/${kernel.modDirVersion}/build \ + make -C ${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build \ INSTALL_MOD_PATH=$out SUBDIRS=`pwd` modules_install '' + '' mkdir -p $out/include/crypto |