Various changes, and added a live-disk config.

2021-07-16 12:57:36 -07:00
parent df7761b11b
commit 7b889633d8
14 changed files with 190 additions and 57 deletions
@@ -66,10 +66,16 @@ in {
      buildInputs = oldAttrs.buildInputs ++ [ pkgs.krb5 ];
    });

+    opencv-java = pkgs.opencv.overrideAttrs (oldAttrs: rec {
+      # buildInputs = oldAttrs.buildInputs ++ [ pkgs.ant ];
+      nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.jdk11 pkgs.ant ];
+      # cmakeFlags = oldAttrs.cmakeFlags ++ [ "-DWITH_JAVA=ON" ];
+    });
+
    hll2380dw-cups = import ./hll2380dw-cups.nix {
      inherit (pkgs)
        stdenv fetchurl makeWrapper cups dpkg a2ps ghostscript gnugrep gnused
-        coreutils file perl which;
+        coreutils file perl which lib;
    };

    hll2380dw-lpr = import ./hll2380dw-lp.nix {