diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2019-12-25 16:08:06 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2019-12-29 11:21:10 +0100 |
commit | 4a583c8be5cd0ab31bc09c5d295e0676179bcdc1 (patch) | |
tree | 23d792541dec4085b3338be38efa71453b089d6f /pkgs/os-specific/linux/crda/default.nix | |
parent | 6577ec986a6e13a8d9cad4e38501ab618f11c14a (diff) | |
download | nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar.gz nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar.bz2 nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar.lz nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar.xz nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.tar.zst nixpkgs-4a583c8be5cd0ab31bc09c5d295e0676179bcdc1.zip |
crda: port to Python 3
Diffstat (limited to 'pkgs/os-specific/linux/crda/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/crda/default.nix | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 84c113c648c..501b1fb1884 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgcrypt, libnl, pkgconfig, python2Packages, wireless-regdb }: +{ stdenv, fetchurl, fetchpatch, libgcrypt, libnl, pkgconfig, python3, wireless-regdb }: stdenv.mkDerivation rec { pname = "crda"; @@ -9,9 +9,24 @@ stdenv.mkDerivation rec { url = "http://kernel.org/pub/software/network/crda/crda-${version}.tar.xz"; }; + patches = [ + # Switch to Python 3 + # https://lore.kernel.org/linux-wireless/1437542484-23409-1-git-send-email-ahmed.taahir@gmail.com/ + (fetchpatch { + url = "https://lore.kernel.org/linux-wireless/1437542484-23409-2-git-send-email-ahmed.taahir@gmail.com/raw"; + sha256 = "0s2n340cgaasvg1k8g9v8xjrbh4y2mcgrhdmv97ja2fs8xjcjbf1"; + }) + (fetchpatch { + url = "https://lore.kernel.org/linux-wireless/1437542484-23409-3-git-send-email-ahmed.taahir@gmail.com/raw"; + sha256 = "01dlfw7kqhyx025jxq2l75950b181p9r7i9zkflcwvbzzdmx59md"; + }) + ]; + buildInputs = [ libgcrypt libnl ]; nativeBuildInputs = [ - pkgconfig python2Packages.m2crypto python2Packages.python + pkgconfig + python3 + python3.pkgs.pycrypto ]; postPatch = '' @@ -37,6 +52,11 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "verify"; + postInstall = '' + # The patch installs build header + rm $out/include/reglib/keys-gcrypt.h + ''; + meta = with stdenv.lib; { description = "Linux wireless Central Regulatory Domain Agent"; longDescription = '' |