Merge remote-tracking branch 'upstream/master' into staging

2018-02-24 02:05:30 +02:00
parent 19784ca4c9 7d37688d66
commit ae9d4faff9
31 changed files with 864 additions and 1682 deletions
@@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, cups}:
+
+stdenv.mkDerivation rec {
+  pname = "cups-zj-58";
+  version = "2018-02-22";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "klirichek";
+    repo = "zj-58";
+    rev = "e4212cd";
+    sha256 = "1w2qkspm4qqg5h8n6gmakzhiww7gag64chvy9kf89xsl3wsyp6pi";
+  };
+
+  buildInputs = [ cups ];
+
+  installPhase = ''
+    install -D rastertozj $out/lib/cups/filter/rastertozj
+    install -D ZJ-58.ppd $out/share/cups/model/zjiang/ZJ-58.ppd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CUPS filter for thermal printer Zjiang ZJ-58";
+    homepage = https://github.com/klirichek/zj-58;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ makefu ];
+    license = licenses.bsd2;
+  };
+}