summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2021-06-06 19:15:44 +0200
committermakefu <github@syntax-fehler.de>2021-06-06 19:15:44 +0200
commit74058abe0b5da0753c2167d6bab29eb1eae88366 (patch)
tree748e9e75c0498161629597f7469933e69303168b /makefu/5pkgs
parent88a845f7a1a037bf6bcf23863d41f36c4cedcd7e (diff)
parenta5bc9126db72f59062ff9d6a72b2fa35437b42cb (diff)
Merge branch '21.05'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/droidcam/default.nix55
-rw-r--r--makefu/5pkgs/shiori/default.nix4
-rw-r--r--makefu/5pkgs/tt-rss/default.nix25
3 files changed, 2 insertions, 82 deletions
diff --git a/makefu/5pkgs/droidcam/default.nix b/makefu/5pkgs/droidcam/default.nix
deleted file mode 100644
index d30fb01a6..000000000
--- a/makefu/5pkgs/droidcam/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, fetchFromGitHub
-, pkg-config
-, alsaLib
-, libjpeg_turbo
-, ffmpeg
-, libusbmuxd
-, speex
-, gtk3
-, libappindicator-gtk3
-}:
-
-stdenv.mkDerivation rec {
- pname = "droidcam";
- version = "1.6";
-
- src = fetchFromGitHub {
- owner = "aramg";
- repo = "droidcam";
- rev = "v${version}";
- sha256 = "1d9qpnmqa3pfwsrpjnxdz76ipk4w37bbxyrazchh4vslnfc886fx";
- };
-
- sourceRoot = "source/linux";
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- alsaLib
- libjpeg_turbo
- ffmpeg
- libusbmuxd
- speex
- gtk3
- libappindicator-gtk3
- ];
-
- buildPhase = ''
- runHook preBuild
- make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG="$(pkg-config --libs --cflags libturbojpeg)"
- '';
- installPhase = ''
- runHook preInstall
- install -Dm755 "droidcam" "$out/bin/droidcam"
- install -Dm755 "droidcam-cli" "$out/bin/droidcam-cli"
- install -Dm644 icon2.png "$out/share/pixmaps/droidcam.png"
- install -Dm644 README.md "$out/share/licenses/droidcam/LICENSE"
- '';
-
- meta = with stdenv.lib; {
- description = "A kernel module to create V4L2 loopback devices";
- homepage = "https://github.com/aramg/droidcam";
- license = licenses.gpl2;
- maintainers = [ maintainers.makefu ];
- platforms = platforms.linux;
- };
-}
diff --git a/makefu/5pkgs/shiori/default.nix b/makefu/5pkgs/shiori/default.nix
index ee4aa9304..7de1e5ae1 100644
--- a/makefu/5pkgs/shiori/default.nix
+++ b/makefu/5pkgs/shiori/default.nix
@@ -1,6 +1,6 @@
-{ go_1_14, buildGoPackage, fetchFromGitHub }:
+{ buildGoPackage, fetchFromGitHub }:
let
- builder = buildGoPackage.override { go = go_1_14; };
+ builder = buildGoPackage;
in
builder rec {
name = "shiori-${version}";
diff --git a/makefu/5pkgs/tt-rss/default.nix b/makefu/5pkgs/tt-rss/default.nix
deleted file mode 100644
index 4907a73a5..000000000
--- a/makefu/5pkgs/tt-rss/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- pname = "tt-rss";
- version = "2020-09-23";
- rev = "d0ed7890df";
-
- src = fetchurl {
- url = "https://git.tt-rss.org/git/tt-rss/archive/${rev}.tar.gz";
- sha256 = "1b2fczd41bqg9bq37r99svrqswr9qrp35m6gn3nz032yqcwc22ij";
- };
-
- installPhase = ''
- mkdir $out
- cp -ra * $out/
- '';
-
- meta = with stdenv.lib; {
- description = "Web-based news feed (RSS/Atom) aggregator";
- license = licenses.gpl2Plus;
- homepage = "https://tt-rss.org";
- maintainers = with maintainers; [ globin zohl ];
- platforms = platforms.all;
- };
-}