summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2021-06-10 21:42:06 +0200
committertv <tv@krebsco.de>2021-06-10 21:42:06 +0200
commit0e6e8b7188b4a2aab7ca467cb20514a70ba09011 (patch)
treecfa9ab8a1a83e0dd139255cf7f7b29bf9a37fdf6 /makefu/5pkgs
parent44c4cb6a453f5bc34c870caa6802548c099e9435 (diff)
parent04a081a3be600cc5e74aadd4f0fee899d6987a85 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg2
-rw-r--r--makefu/5pkgs/chitubox/default.nix67
-rw-r--r--makefu/5pkgs/droidcam/default.nix55
-rw-r--r--makefu/5pkgs/hdl-dump/default.nix33
-rw-r--r--makefu/5pkgs/shiori/default.nix4
-rw-r--r--makefu/5pkgs/tt-rss/default.nix25
6 files changed, 71 insertions, 115 deletions
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index bbf15e603..049c145dd 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -489,6 +489,8 @@ awful.rules.rules = {
properties = { tag = tags[4] } },
{ rule = { class = "telegram-desktop" },
properties = { tag = tags[4] } },
+ { rule = { class = "element-desktop" },
+ properties = { tag = tags[4] } },
{ rule = { class = "mutt" },
properties = { tag = tags[5] } },
{ rule = { class = "mosh" },
diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
new file mode 100644
index 000000000..bea33e64f
--- /dev/null
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, autoPatchelfHook, libglvnd
+, libgcrypt,zlib,glib,fontconfig,freetype,libdrm
+, libxkbcommon
+, libpulseaudio
+, xlibs
+, gst_all_1
+, kerberos
+, alsaLib
+}:
+# via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix
+stdenv.mkDerivation rec {
+ pname = "chitubox";
+
+ version = "1.8.1";
+
+ src = builtins.fetchTarball {
+ #url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
+ url = "https://archive.org/download/chitubox-v-1.8.1.tar/CHITUBOX_V${version}.tar.gz";
+ sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
+ };
+ nativeBuildInputs = [ autoPatchelfHook ];
+
+ buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm
+ libxkbcommon libpulseaudio kerberos alsaLib
+ xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
+ gst_all_1.gst-plugins-base gst_all_1.gstreamer
+];
+
+ buildPhase = ''
+ mkdir -p bin
+ mv CHITUBOX bin/chitubox
+
+ # Remove unused stuff
+ rm AppRun
+
+ # Place resources where ChiTuBox can expect to find them
+ mkdir ChiTuBox
+ mv resource ChiTuBox/
+
+ # Configure Qt paths
+ cat << EOF > bin/qt.conf
+ [Paths]
+ Prefix = $out
+ Plugins = plugins
+ Imports = qml
+ Qml2Imports = qml
+ EOF
+ '';
+
+ installPhase = ''
+ mkdir -p $out
+ mv * $out/
+ '';
+
+ autoPatchelfIgnoreMissingDeps=true;
+
+ meta = {
+ description = "A Revolutionary Tool to Change 3D Printing Processes within One Click";
+ homepage = "https://www.chitubox.com";
+ license = {
+ fullName = "ChiTuBox EULA";
+ shortName = "ChiTuBox";
+ url = "https://www.chitubox.com";
+ };
+ };
+}
+
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/hdl-dump/default.nix b/makefu/5pkgs/hdl-dump/default.nix
deleted file mode 100644
index bd454223a..000000000
--- a/makefu/5pkgs/hdl-dump/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, lib, pkgs, fetchurl,fetchFromGitHub, upx, wine }:
-stdenv.mkDerivation rec {
- pname = "hdl-dump";
- version = "75df8d7";
- name = "${pname}-${version}";
-
- src = fetchFromGitHub {
- owner = "AKuHAK";
- repo = "hdl-dump";
- rev = version;
- sha256 = "10jjr6p5yn0c182x17m7q68jmf8gizcny7wjxw7z5yh0fv5s48z4";
- };
-
- buildInputs = [ upx wine ];
-
- makeFlags = [ "RELEASE=yes" ];
-
- # uses wine, currently broken
- #postBuild = ''
- # make -C gui
- #'';
-
- installPhase = ''
- mkdir -p $out/bin
- cp hdl_dump $out/bin
- '';
-
- meta = {
- homepage = https://github.com/AKuHAK/hdl-dump ;
- description = "copy isos to psx hdd";
- license = lib.licenses.gpl2;
- };
-}
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;
- };
-}