From fb804140f577a7bc03d26829f59991a5b3c5475f Mon Sep 17 00:00:00 2001
From: Jens Nolte <jens@nightmarestudio.de>
Date: Sat, 2 May 2020 01:44:44 +0200
Subject: [PATCH] Remove wayvnc and neatvnc because they are upstreamed in
nixpkgs.
---
pkgs/neatvnc/default.nix | 5 -----
pkgs/neatvnc/neatvnc.nix | 36 ------------------------------------
pkgs/neatvnc/repo.json | 6 ------
pkgs/neatvnc/update | 5 -----
pkgs/wayvnc/default.nix | 8 --------
pkgs/wayvnc/repo.json | 6 ------
pkgs/wayvnc/update | 5 -----
pkgs/wayvnc/wayvnc.nix | 36 ------------------------------------
8 files changed, 107 deletions(-)
delete mode 100644 pkgs/neatvnc/default.nix
delete mode 100644 pkgs/neatvnc/neatvnc.nix
delete mode 100644 pkgs/neatvnc/repo.json
delete mode 100755 pkgs/neatvnc/update
delete mode 100644 pkgs/wayvnc/default.nix
delete mode 100644 pkgs/wayvnc/repo.json
delete mode 100755 pkgs/wayvnc/update
delete mode 100644 pkgs/wayvnc/wayvnc.nix
diff --git a/pkgs/neatvnc/default.nix b/pkgs/neatvnc/default.nix
deleted file mode 100644
index ff342f4..0000000
--- a/pkgs/neatvnc/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-{
- neatvnc = pkgs.callPackage ./neatvnc.nix {};
-}
\ No newline at end of file
diff --git a/pkgs/neatvnc/neatvnc.nix b/pkgs/neatvnc/neatvnc.nix
deleted file mode 100644
index 0886e75..0000000
--- a/pkgs/neatvnc/neatvnc.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, libdrm, pixman, libuv, gnutls, libjpeg_turbo }:
-
-with builtins;
-
-let
- repo = fromJSON ( readFile ./repo.json );
-in
-stdenv.mkDerivation {
- pname = "neatvnc";
- version = repo.rev;
-
- src = fetchFromGitHub repo;
-
- nativeBuildInputs = [
- pkgconfig meson ninja
- ];
-
- buildInputs = [
- pixman libuv gnutls libdrm libjpeg_turbo
- ];
-
- enableParallelBuilding = true;
-
- # mesonFlags = [
- # "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
- # "-Dtray=enabled" "-Dman-pages=enabled"
- # ];
-
- # meta = with stdenv.lib; {
- # description = "i3-compatible tiling Wayland compositor";
- # homepage = https://swaywm.org;
- # license = licenses.mit;
- # platforms = platforms.linux;
- # maintainers = with maintainers; [ primeos synthetica ma27 ];
- # };
-}
\ No newline at end of file
diff --git a/pkgs/neatvnc/repo.json b/pkgs/neatvnc/repo.json
deleted file mode 100644
index e19bbad..0000000
--- a/pkgs/neatvnc/repo.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "owner": "any1",
- "repo": "neatvnc",
- "rev": "992b4445edea7199ec0d2d673d726767f1da4f5f",
- "sha256": "12nv74x4mjw9xz2ahj1mm45jfifmdrpbap3dpn2w7nj5av6ivvm6"
-}
\ No newline at end of file
diff --git a/pkgs/neatvnc/update b/pkgs/neatvnc/update
deleted file mode 100755
index 9decc08..0000000
--- a/pkgs/neatvnc/update
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i sh -p nix-prefetch-github
-
-nix-prefetch-github any1 neatvnc > repo.json
-
diff --git a/pkgs/wayvnc/default.nix b/pkgs/wayvnc/default.nix
deleted file mode 100644
index 29fddff..0000000
--- a/pkgs/wayvnc/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-let
- neatvnc = pkgs.callPackage ../neatvnc/neatvnc.nix {};
-in
-{
- wayvnc = pkgs.callPackage ./wayvnc.nix { inherit neatvnc; };
-}
\ No newline at end of file
diff --git a/pkgs/wayvnc/repo.json b/pkgs/wayvnc/repo.json
deleted file mode 100644
index 7c58977..0000000
--- a/pkgs/wayvnc/repo.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "owner": "any1",
- "repo": "wayvnc",
- "rev": "908ba0f904a0e552a6bbe63fbd04e243b4f4685f",
- "sha256": "0vly9m10jd3zlrpncipblqsqc3jf94lyhz5yb05b5c8hvqdk8w3g"
-}
\ No newline at end of file
diff --git a/pkgs/wayvnc/update b/pkgs/wayvnc/update
deleted file mode 100755
index 0ce5ae1..0000000
--- a/pkgs/wayvnc/update
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i sh -p nix-prefetch-github
-
-nix-prefetch-github any1 wayvnc > repo.json
-
diff --git a/pkgs/wayvnc/wayvnc.nix b/pkgs/wayvnc/wayvnc.nix
deleted file mode 100644
index 33e3bd5..0000000
--- a/pkgs/wayvnc/wayvnc.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, pkgconfig, ninja, libdrm, libX11, pixman, libuv, libGL, libxkbcommon, wayland, neatvnc }:
-
-with builtins;
-
-let
- repo = fromJSON ( readFile ./repo.json );
-in
-stdenv.mkDerivation {
- pname = "wayvnc";
- version = repo.rev;
-
- src = fetchFromGitHub repo;
-
- nativeBuildInputs = [
- pkgconfig meson ninja
- ];
-
- buildInputs = [
- pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11
- ];
-
- enableParallelBuilding = true;
-
- # mesonFlags = [
- # "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled"
- # "-Dtray=enabled" "-Dman-pages=enabled"
- # ];
-
- # meta = with stdenv.lib; {
- # description = "i3-compatible tiling Wayland compositor";
- # homepage = https://swaywm.org;
- # license = licenses.mit;
- # platforms = platforms.linux;
- # maintainers = with maintainers; [ primeos synthetica ma27 ];
- # };
-}
\ No newline at end of file
--
GitLab