diff options
| -rw-r--r-- | makefu/1systems/x/x13/default.nix | 2 | ||||
| -rw-r--r-- | makefu/5pkgs/xmm7360/default.nix | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/makefu/1systems/x/x13/default.nix b/makefu/1systems/x/x13/default.nix index ea557bbef..f0d663ee9 100644 --- a/makefu/1systems/x/x13/default.nix +++ b/makefu/1systems/x/x13/default.nix @@ -8,7 +8,7 @@ <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough # <stockholm/makefu/2configs/hw/tpm.nix> <stockholm/makefu/2configs/hw/ssd.nix> - # <stockholm/makefu/2configs/hw/xmm7360.nix> + <stockholm/makefu/2configs/hw/xmm7360.nix> ]; boot.zfs.requestEncryptionCredentials = true; networking.hostId = "f8b8e0a2"; diff --git a/makefu/5pkgs/xmm7360/default.nix b/makefu/5pkgs/xmm7360/default.nix index 5e423b5af..76cdc2cbf 100644 --- a/makefu/5pkgs/xmm7360/default.nix +++ b/makefu/5pkgs/xmm7360/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python3, kernel, kmod }: let - py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 ]); + py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 p.dbus-python ]); in stdenv.mkDerivation rec { name = "xmm7360-pci-${version}-${kernel.version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "xmm7360"; repo = "xmm7360-pci"; - rev = "0060149"; - sha256 = "0nr7adlwglpw6hp44x0pq8xhv7kik7nsb8yzbxllvy2v1pinyflv"; + rev = "b28714b6fb73887ecd5c0c25ffc0613d6eab6533"; + sha256 = "1f1r3cnnjaxdxig56a9v4wfjq1r2z1wg8lq59klxxnybydk91m60"; }; #sourceRoot = "source/linux/v4l2loopback"; @@ -27,12 +27,13 @@ stdenv.mkDerivation rec { "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + installFlags = [ "DEPMOD=true" ]; postInstall = '' install -d $out/lib/xmm7360/ cp -r rpc/ $out/lib/xmm7360/ cat > open_xdatachannel <<EOF cd $out/lib/xmm7360 - exec ${py}/bin/python3 rpc/open_xdatachannel.py $@ + exec ${py}/bin/python3 rpc/open_xdatachannel.py "\$@" EOF install -D open_xdatachannel $out/bin/open_xdatachannel ''; |