public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #103124 from xfix/update-ndiswrapper 

linuxPackages.ndiswrapper: 1.62-pre -> 1.63
This commit is contained in:
Timo Kaufmann 2020-11-18 22:32:08 +01:00 committed by GitHub
parent 3c9c52db49 0788a95557
commit 9140b112b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/os-specific/linux/ndiswrapper/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, kernel, perl, kmod, libelf }: { stdenv, fetchurl, kernel, perl, kmod, libelf }:
let let
version = "1.62-pre"; version = "1.63";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ndiswrapper-${version}-${kernel.version}"; name = "ndiswrapper-${version}-${kernel.version}";
@ -14,7 +14,6 @@ stdenv.mkDerivation {
kernel = kernel.dev; kernel = kernel.dev;
buildPhase = " buildPhase = "
cd ndiswrapper
echo make KBUILD=$(echo \$kernel/lib/modules/*/build); echo make KBUILD=$(echo \$kernel/lib/modules/*/build);
echo -n $kernel/lib/modules/*/build > kbuild_path echo -n $kernel/lib/modules/*/build > kbuild_path
export PATH=${kmod}/sbin:$PATH export PATH=${kmod}/sbin:$PATH
@ -30,12 +29,9 @@ stdenv.mkDerivation {
patchShebangs $out/sbin patchShebangs $out/sbin
''; '';
# should we use unstable? src = fetchurl {
src = fetchFromGitHub { url = "mirror://sourceforge/ndiswrapper/files/stable/ndiswrapper-${version}.tar.gz";
owner = "pgiri"; sha256 = "1v6b66jhisl110jfl00hm43lmnrav32vs39d85gcbxrjqnmcx08g";
repo = "ndiswrapper";
rev = "5e29f6a9d41df949b435066c173e3b1947f179d3";
sha256 = "0sprrmxxkf170bmh1nz9xw00gs89dddr84djlf666bn5bhy6jffi";
}; };
buildInputs = [ perl libelf ]; buildInputs = [ perl libelf ];
@ -45,5 +41,6 @@ stdenv.mkDerivation {
homepage = "https://sourceforge.net/projects/ndiswrapper"; homepage = "https://sourceforge.net/projects/ndiswrapper";
license = "GPL"; license = "GPL";
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
broken = stdenv.lib.versionAtLeast kernel.version "5.8";
}; };
} }

6
pkgs/os-specific/linux/ndiswrapper/no-sbin.patch
View File

@ -1,7 +1,5 @@
diff --git a/ndiswrapper/driver/Makefile b/ndiswrapper/driver/Makefile --- a/driver/Makefile
index bf42f7bc..ad23aa2d 100644 +++ b/driver/Makefile
--- a/ndiswrapper/driver/Makefile
+++ b/ndiswrapper/driver/Makefile
@@ -191,7 +191,7 @@ clean: @@ -191,7 +191,7 @@ clean:
rm -rf .tmp_versions rm -rf .tmp_versions