diff options
author | Konrad Borowski <konrad@borowski.pw> | 2020-11-08 12:05:54 +0100 |
---|---|---|
committer | Konrad Borowski <konrad@borowski.pw> | 2020-11-18 10:59:38 +0100 |
commit | 0788a95557f33a9345a75aa6e138b9e623301a07 (patch) | |
tree | 3c57c8bb383ac5272247d1f3b52e1e92ca7b879e /pkgs/os-specific/linux/ndiswrapper | |
parent | 84884a4938b6f552db7a3aa5478521ce7bcbac5f (diff) | |
download | nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar.gz nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar.bz2 nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar.lz nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar.xz nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.tar.zst nixpkgs-0788a95557f33a9345a75aa6e138b9e623301a07.zip |
linuxPackages.ndiswrapper: 1.62-pre -> 1.63
Diffstat (limited to 'pkgs/os-specific/linux/ndiswrapper')
-rw-r--r-- | pkgs/os-specific/linux/ndiswrapper/default.nix | 15 | ||||
-rw-r--r-- | pkgs/os-specific/linux/ndiswrapper/no-sbin.patch | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index 34c77bc3e6a..92da7f6fb82 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, kernel, perl, kmod, libelf }: +{ stdenv, fetchurl, kernel, perl, kmod, libelf }: let - version = "1.62-pre"; + version = "1.63"; in stdenv.mkDerivation { name = "ndiswrapper-${version}-${kernel.version}"; @@ -14,7 +14,6 @@ stdenv.mkDerivation { kernel = kernel.dev; buildPhase = " - cd ndiswrapper echo make KBUILD=$(echo \$kernel/lib/modules/*/build); echo -n $kernel/lib/modules/*/build > kbuild_path export PATH=${kmod}/sbin:$PATH @@ -30,12 +29,9 @@ stdenv.mkDerivation { patchShebangs $out/sbin ''; - # should we use unstable? - src = fetchFromGitHub { - owner = "pgiri"; - repo = "ndiswrapper"; - rev = "5e29f6a9d41df949b435066c173e3b1947f179d3"; - sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi"; + src = fetchurl { + url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz"; + sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g"; }; buildInputs = [ perl libelf ]; @@ -45,5 +41,6 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/ndiswrapper"; license = "GPL"; platforms = [ "i686-linux" "x86_64-linux" ]; + broken = stdenv.lib.versionAtLeast kernel.version "5.8"; }; } diff --git a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch index 34965540d24..373965fb085 100644 --- a/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch +++ b/pkgs/os-specific/linux/ndiswrapper/no-sbin.patch @@ -1,7 +1,5 @@ -diff --git a/ndiswrapper/driver/Makefile b/ndiswrapper/driver/Makefile -index bf42f7bc..ad23aa2d 100644 ---- a/ndiswrapper/driver/Makefile -+++ b/ndiswrapper/driver/Makefile +--- a/driver/Makefile ++++ b/driver/Makefile @@ -191,7 +191,7 @@ clean: rm -rf .tmp_versions |