summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/5pkgs')
-rw-r--r--makefu/5pkgs/awesomecfg/full.cfg15
-rw-r--r--makefu/5pkgs/opl-pc-tools/default.nix44
-rw-r--r--makefu/5pkgs/prison-break/default.nix5
-rw-r--r--makefu/5pkgs/soldat/default.nix118
-rw-r--r--makefu/5pkgs/studio-link/default.nix1
-rw-r--r--makefu/5pkgs/xmm7360/default.nix9
6 files changed, 58 insertions, 134 deletions
diff --git a/makefu/5pkgs/awesomecfg/full.cfg b/makefu/5pkgs/awesomecfg/full.cfg
index 049c145dd..a86d3ac1f 100644
--- a/makefu/5pkgs/awesomecfg/full.cfg
+++ b/makefu/5pkgs/awesomecfg/full.cfg
@@ -477,6 +477,7 @@ awful.rules.rules = {
keys = clientkeys,
screen = awful.screen.focused,
buttons = clientbuttons } },
+ -- get class via `xprop WM_CLASS` -- will be second string
--{ rule = { class = "MPlayer" },
-- properties = { floating = true } },
{ rule = { class = "pinentry" },
@@ -485,19 +486,14 @@ awful.rules.rules = {
-- properties = { floating = true } },
{ rule = { class = "Firefox" },
properties = { tag = tags[3] } },
- { rule = { class = "signal-desktop" },
+ { rule = { class = "Signal" },
properties = { tag = tags[4] } },
- { rule = { class = "telegram-desktop" },
+ { rule = { class = "TelegramDesktop" },
properties = { tag = tags[4] } },
- { rule = { class = "element-desktop" },
- properties = { tag = tags[4] } },
- { rule = { class = "mutt" },
- properties = { tag = tags[5] } },
- { rule = { class = "mosh" },
- properties = { tag = tags[2] } },
+ { rule = { class = "Element" },
+ properties = { tag = tags[4] } }
}
-- }}}
-
-- {{{ Signals
-- Signal function to execute when a new client appears.
client.connect_signal("manage", function (c, startup)
@@ -573,6 +569,7 @@ do
awful.spawn("urxvt -e mosh makefu@gum.i", { tag = tags[2] })
awful.spawn("firefox", { tag = tags[3] })
awful.spawn("telegram-desktop", { tag = tags[4] })
+ awful.spawn("element-desktop", { tag = tags[4] })
awful.spawn("signal-desktop", { tag = tags[4] })
awful.spawn("urxvt -e mutt", { tag = tags[5] })
end
diff --git a/makefu/5pkgs/opl-pc-tools/default.nix b/makefu/5pkgs/opl-pc-tools/default.nix
new file mode 100644
index 000000000..a670b939a
--- /dev/null
+++ b/makefu/5pkgs/opl-pc-tools/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, meson
+, ninja
+, qt5
+, wrapQtAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ pname = "OPL-PC-Tools";
+ version = "3.0";
+
+ src = fetchFromGitHub {
+ owner = "brainstream";
+ repo = "OPL-PC-Tools";
+ rev = version;
+ sha256 = "1772j99r7ssf45512z5256142gj2ds9mgqv5m8k6hszd5jbnc9qc";
+ };
+
+ #dontUseCmakeConfigure = true;
+ nativeBuildInputs = [ cmake pkg-config meson ninja
+ wrapQtAppsHook
+];
+buildInputs = with qt5;[ qtbase
+qttools
+];
+
+installPhase = ''
+ls -lahtr .
+ mkdir -p $out/bin
+ cp oplpctools $out/bin/
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/joshkunz/ashuffle";
+ description = "Automatic library-wide shuffle for mpd";
+ maintainers = [ maintainers.tcbravo ];
+ platforms = platforms.unix;
+ license = licenses.mit;
+ };
+}
diff --git a/makefu/5pkgs/prison-break/default.nix b/makefu/5pkgs/prison-break/default.nix
index affeb8c4d..516af6855 100644
--- a/makefu/5pkgs/prison-break/default.nix
+++ b/makefu/5pkgs/prison-break/default.nix
@@ -3,17 +3,18 @@ with pkgs.python3.pkgs;
buildPythonPackage rec {
pname = "prison-break";
- version = "1.3.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "makefu";
repo = pname;
rev = version;
- sha256 = "sha256:1kjfwsz6wg5l9pa7484vq64f054qil0ksf6dh9arwspxwnzshgdh";
+ sha256 = "sha256:0gk7g5k9hzscsdkddm6978m43f4cdv2nzr47sclhjl7g2x7v97pm";
};
propagatedBuildInputs = [
docopt
requests
beautifulsoup4
+ notify2
(callPackage ./straight-plugin.nix {})
];
checkInputs = [ black ];
diff --git a/makefu/5pkgs/soldat/default.nix b/makefu/5pkgs/soldat/default.nix
deleted file mode 100644
index 7518ddee5..000000000
--- a/makefu/5pkgs/soldat/default.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{ stdenv,fpc,zip, fetchFromGitHub, autoPatchelfHook, callPackage,
-freetype,openal,x11,SDL2,physfs_2, protobuf, openssl, cmake, ninja,
-meson,pkgconfig, makeWrapper }:
-
-let
- GameNetworkingSockets = stdenv.mkDerivation rec {
- pname = "GameNetworkingSockets";
- version = "2020-02-27";
-
- src = fetchFromGitHub {
- sha256 = "1vlrqjpqmdv1gphj2bkqg0bljqxfv75say6vrcnk9z14irih9a24";
- owner = "ValveSoftware";
- repo = pname;
- rev = "36d41513e9a25d7ad4c2b37826d6594aaf185374";
- };
-
- mesonFlags = [ "-Dlight_tests=true" ];
-
- buildInputs = [ protobuf openssl ];
- nativeBuildInputs = [ pkgconfig meson cmake ninja ];
- installPhase = ''
- mkdir -p $out/lib $out/include; find .
- cp src/libGameNetworkingSockets.so $out/lib/
- cp -r ../include $out/
- '';
-
-
- #outputs = [ "out" "dev" "lib" ];
-
- meta = with stdenv.lib; {
- description = "WebDav server implementation and library using libsoup";
- homepage = "https://wiki.gnome.org/phodav";
- license = licenses.lgpl21;
- maintainers = with maintainers; [ gnidorah ];
- platforms = platforms.linux;
- };
- };
- base = stdenv.mkDerivation {
- pname = "soldat-base";
- version = "1.0.0";
- src = fetchFromGitHub {
- repo = "base";
- owner = "soldat";
- rev = "3c002b9";
- sha256 = "1wc1cmdavf6ng05wfcpxn124n23vivx4nn06irqmar6jmrklrbq0";
- };
- buildInputs = [ zip ];
- buildPhase = ''
- sh ./create_smod.sh
- '';
- installPhase = ''
- install -D soldat.smod $out/soldat.smod
- install -D client/play-regular.ttf $out/play-regular.ttf
- '';
- };
- src = fetchFromGitHub {
- repo = "soldat";
- owner = "soldat";
- rev = "6dee4d0";
- sha256 = "0jjgdxprlvyf5kh2mb48vrp5nxk3h3jbaxmy7xmna80ssx4bjhxf";
- };
- stb = stdenv.mkDerivation {
- pname = "soldat";
- version = "1.0.0";
- inherit src;
- # makeFlags = [ "CFLAGS='-Fl${openal}/lib'" ];
- buildPhase = ''
- cd client
- mkdir -p build/linux
- make -C libs/stb/
- '';
- installPhase = ''
- install -D build/libstb.so $out/lib/libstb.so
- '';
-
- buildInputs = [ ];
- };
-in
-stdenv.mkDerivation {
- pname = "soldat";
- version = "1.0.0";
- inherit src;
- # makeFlags = [ "CFLAGS='-Fl${openal}/lib'" ];
- buildPhase = ''
- cd client
- mkdir -p build/linux
- make -C libs/stb/
- make linux_x86_64
- cd ../server
- mkdir -p build/linux
- make linux_x86_64
- cd ..
- '';
-
- # TODO: soldatserver still needs to be copied out of the derivation to somewhere writeable
- installPhase = ''
- share=$out/share/soldat
- bin=$out/bin
- mkdir -p $share $bin
-
- install ${base}/soldat.smod $share/soldat.smod
- install ${base}/play-regular.ttf $share/play-regular.ttf;
-
- install -m755 client/build/soldat_x64 $share/soldat_x64
- install client/media/soldat.ico $share/soldat.ico
-
- install -m755 server/build/soldatserver_x64 $share/soldatserver_x64
-
- makeWrapper $share/soldat_x64 $bin/soldat --add-flags '-fs_portable 0'
- makeWrapper $share/soldatserver_x64 $bin/soldatserver --add-flags '-fs_userpath ~/.local/share/Soldat/Soldat'
- '';
-
- nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
- buildInputs = [
- fpc freetype openal x11 SDL2 physfs_2 GameNetworkingSockets stb
- ];
-}
-
diff --git a/makefu/5pkgs/studio-link/default.nix b/makefu/5pkgs/studio-link/default.nix
index 4d595d9f8..3a02e365c 100644
--- a/makefu/5pkgs/studio-link/default.nix
+++ b/makefu/5pkgs/studio-link/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
alsaLib
openssl
zlib
- libjack2
pulseaudio
];
diff --git a/makefu/5pkgs/xmm7360/default.nix b/makefu/5pkgs/xmm7360/default.nix
index 5e423b5af..76cdc2cbf 100644
--- a/makefu/5pkgs/xmm7360/default.nix
+++ b/makefu/5pkgs/xmm7360/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python3, kernel, kmod }:
let
- py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 ]);
+ py = python3.withPackages (p: [ p.ConfigArgParse p.pyroute2 p.dbus-python ]);
in
stdenv.mkDerivation rec {
name = "xmm7360-pci-${version}-${kernel.version}";
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "xmm7360";
repo = "xmm7360-pci";
- rev = "0060149";
- sha256 = "0nr7adlwglpw6hp44x0pq8xhv7kik7nsb8yzbxllvy2v1pinyflv";
+ rev = "b28714b6fb73887ecd5c0c25ffc0613d6eab6533";
+ sha256 = "1f1r3cnnjaxdxig56a9v4wfjq1r2z1wg8lq59klxxnybydk91m60";
};
#sourceRoot = "source/linux/v4l2loopback";
@@ -27,12 +27,13 @@ stdenv.mkDerivation rec {
"KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
+ installFlags = [ "DEPMOD=true" ];
postInstall = ''
install -d $out/lib/xmm7360/
cp -r rpc/ $out/lib/xmm7360/
cat > open_xdatachannel <<EOF
cd $out/lib/xmm7360
- exec ${py}/bin/python3 rpc/open_xdatachannel.py $@
+ exec ${py}/bin/python3 rpc/open_xdatachannel.py "\$@"
EOF
install -D open_xdatachannel $out/bin/open_xdatachannel
'';
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:13:41 +0000