Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma pkgs.xmm7360: bump to latest HEAD

Browse Source
This commit is contained in:
makefu 2021-10-01 18:32:01 +02:00
parent 39b20119e1
commit 8b9a53d7e1
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefu/1systems/x/x13/default.nix
View File

@ -8,7 +8,7 @@
<nixos-hardware/lenovo/thinkpad/l14/amd> # close enough <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
# <stockholm/makefu/2configs/hw/tpm.nix> # <stockholm/makefu/2configs/hw/tpm.nix>
<stockholm/makefu/2configs/hw/ssd.nix> <stockholm/makefu/2configs/hw/ssd.nix>
# <stockholm/makefu/2configs/hw/xmm7360.nix> <stockholm/makefu/2configs/hw/xmm7360.nix>
]; ];
boot.zfs.requestEncryptionCredentials = true; boot.zfs.requestEncryptionCredentials = true;
networking.hostId = "f8b8e0a2"; networking.hostId = "f8b8e0a2";

9
makefu/5pkgs/xmm7360/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, kernel, kmod }: { stdenv, fetchFromGitHub, python3, kernel, kmod }:
let let
py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 ]); py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 p.dbus-python ]);
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xmm7360-pci-${version}-${kernel.version}"; name = "xmm7360-pci-${version}-${kernel.version}";
@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xmm7360"; owner = "xmm7360";
repo = "xmm7360-pci"; repo = "xmm7360-pci";
rev = "0060149"; rev = "b28714b6fb73887ecd5c0c25ffc0613d6eab6533";
sha256 = "0nr7adlwglpw6hp44x0pq8xhv7kik7nsb8yzbxllvy2v1pinyflv"; sha256 = "1f1r3cnnjaxdxig56a9v4wfjq1r2z1wg8lq59klxxnybydk91m60";
}; };
#sourceRoot = "source/linux/v4l2loopback"; #sourceRoot = "source/linux/v4l2loopback";
@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)" "INSTALL_MOD_PATH=$(out)"
]; ];
installFlags = [ "DEPMOD=true" ];
postInstall = '' postInstall = ''
install -d $out/lib/xmm7360/ install -d $out/lib/xmm7360/
cp -r rpc/ $out/lib/xmm7360/ cp -r rpc/ $out/lib/xmm7360/
cat > open_xdatachannel <<EOF cat > open_xdatachannel <<EOF
cd $out/lib/xmm7360 cd $out/lib/xmm7360
exec ${py}/bin/python3 rpc/open_xdatachannel.py $@ exec ${py}/bin/python3 rpc/open_xdatachannel.py "\$@"
EOF EOF
install -D open_xdatachannel $out/bin/open_xdatachannel install -D open_xdatachannel $out/bin/open_xdatachannel
''; '';