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/os-specific/linux/iwlwifi/default.nix | |
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/os-specific/linux/iwlwifi/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/iwlwifi/default.nix | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix deleted file mode 100644 index 1a28720f0042..000000000000 --- a/pkgs/os-specific/linux/iwlwifi/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, kernelDev}: - -let version = "1.2.25"; in - -stdenv.mkDerivation rec { - name = "iwlwifi-${version}-${kernelDev.version}"; - - src = fetchurl { - url = "http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-${version}.tgz"; - sha256 = "09fjy0swcyd77fdp8x2825wj5cd73hwbzl8mz9sy2ha21p1qwq1d"; - }; - - preBuild = '' - substituteInPlace scripts/generate_compatible \ - --replace '/usr/bin/env /bin/bash' $shell - substituteInPlace Makefile \ - --replace /sbin/depmod true - - # Urgh, we need the complete kernel sources for some header - # files. So unpack the original kernel source tarball and copy - # the configured include directory etc. on top of it. - kernelVersion=$(cd ${kernelDev}/lib/modules && ls) - kernelBuild=$(echo ${kernelDev}/lib/modules/$kernelVersion/source) - tar xvfj ${kernelDev.src} - kernelSource=$(echo $(pwd)/linux-*) - cp -prd $kernelBuild/* $kernelSource - - makeFlags=KSRC=$kernelSource - make $makeFlags || true - make $makeFlags - - installFlags=KMISC=$out/lib/modules/$kernelVersion/misc - ''; # */ - - meta = { - description = "Intel Wireless WiFi Link drivers for Linux"; - homepage = http://www.intellinuxwireless.org/; - license = "GPLv2"; - }; -} |