Compare commits

...

4 Commits

Author SHA1 Message Date
FliegendeWurst
a0afc2a463 q: drop
Included in nixpkgs now.
2023-10-16 10:02:24 +02:00
FliegendeWurst
6ed2488820 microsoft-ergonomic-keyboard: fix default kernel 2023-10-16 08:55:51 +02:00
FliegendeWurst
b12a87bc83 microsoft-ergonomic-keyboard: init at 1.0 2023-10-16 08:45:04 +02:00
FliegendeWurst
b5c5a0936e openscad-snapshot: add desktop item 2023-10-16 08:42:28 +02:00
4 changed files with 51 additions and 30 deletions

View File

@ -17,8 +17,10 @@
diskgraph = pkgs.callPackage ./pkgs/diskgraph { }; diskgraph = pkgs.callPackage ./pkgs/diskgraph { };
freqtop = pkgs.callPackage ./pkgs/freqtop { }; freqtop = pkgs.callPackage ./pkgs/freqtop { };
map = pkgs.callPackage ./pkgs/map { }; map = pkgs.callPackage ./pkgs/map { };
microsoft-ergonomic-keyboard = pkgs.callPackage ./pkgs/microsoft-ergonomic-keyboard {
kernel = pkgs.linuxPackages.kernel;
};
openscad-snapshot = pkgs.callPackage ./pkgs/openscad-snapshot { }; openscad-snapshot = pkgs.callPackage ./pkgs/openscad-snapshot { };
q = pkgs.callPackage ./pkgs/q { };
# TODO: fix dependency specification # TODO: fix dependency specification
#raspi-oled = pkgs.callPackage ./pkgs/raspi-oled { }; #raspi-oled = pkgs.callPackage ./pkgs/raspi-oled { };
raspi-oled-cross = pkgs.pkgsCross.muslpi.callPackage ./pkgs/raspi-oled { }; raspi-oled-cross = pkgs.pkgsCross.muslpi.callPackage ./pkgs/raspi-oled { };

View File

@ -0,0 +1,31 @@
{ stdenv, lib, fetchFromGitLab, kernel, kmod }:
stdenv.mkDerivation rec {
name = "microsoft-ergonomic-keyboard-${version}-${kernel.version}";
version = "1.0";
src = fetchFromGitLab {
owner = "arnekeller";
repo = "microsoft-ergonomic-keyboard";
rev = "f23be31228daa7ce62f019acb8f7a127e5bd846c";
sha256 = "0knjkx4bqjxqsm2wly3dj96w1ljzhxavs26a3m65bb04phcb2n8w";
};
hardeningDisable = [ "pic" "format" ];
nativeBuildInputs = kernel.moduleBuildDependencies;
makeFlags = [
"KERNELRELEASE=${kernel.modDirVersion}"
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
"INSTALL_MOD_PATH=$(out)"
];
meta = with lib; {
description = "A kernel module to fix the office key on MS ergonomic keyboards";
homepage = "https://gitlab.com/arnekeller/microsoft-ergonomic-keyboard";
license = licenses.gpl2Only;
maintainers = [ maintainers.fliegendewurst ];
platforms = platforms.linux;
};
}

View File

@ -1,4 +1,4 @@
{ lib, fetchurl, appimageTools, openscad, makeWrapper }: { lib, fetchurl, appimageTools, openscad, makeWrapper, makeDesktopItem }:
let let
pname = "openscad"; pname = "openscad";
@ -7,6 +7,19 @@ let
url = "https://files.openscad.org/snapshots/OpenSCAD-${version}-x86_64.AppImage"; url = "https://files.openscad.org/snapshots/OpenSCAD-${version}-x86_64.AppImage";
sha256 = "sha256-mEGmkL2lL7JxK0nRPLtnfg4vxtkK3URz351eyuRHZPE="; sha256 = "sha256-mEGmkL2lL7JxK0nRPLtnfg4vxtkK3URz351eyuRHZPE=";
}; };
desktopItem = makeDesktopItem {
name = "OpenSCAD";
exec = "${pname}-${version} %f";
comment = "The Programmers Solid 3D CAD Modeller (development snapshot)";
icon = "openscad-nightly";
desktopName = "OpenSCAD";
genericName = "OpenSCAD";
mimeTypes = [ "application/x-openscad" ];
categories = [ "Graphics" "3DGraphics" "Engineering" ];
keywords = [ "3d" "solid" "geometry" "csg" "model" "stl"];
};
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };
in in
appimageTools.wrapType2 { appimageTools.wrapType2 {
@ -16,6 +29,9 @@ appimageTools.wrapType2 {
source "${makeWrapper}/nix-support/setup-hook" source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname}-${version} \ wrapProgram $out/bin/${pname}-${version} \
--unset QT_PLUGIN_PATH --unset QT_PLUGIN_PATH
mkdir -p $out/share
cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
''; '';
meta = with lib; { meta = with lib; {

View File

@ -1,28 +0,0 @@
{ buildGo118Module, fetchFromGitHub, lib }:
buildGo118Module rec {
pname = "q";
version = "0.6.0";
src = fetchFromGitHub {
owner = "natesales";
repo = "q";
rev = "v${version}";
sha256 = "1qvpw21b7w3awa37vy14xvw4ai3nwrq0qd7gnpl4vx4nd9m5f970";
};
vendorSha256 = "1mv533hbs6bgfzrgnpbp3b1rijc7xdn93jnr8lksh8z7ddkw44wc";
ldflags = [
"-X main.version=${version}"
];
doCheck = false; # requires network access
meta = with lib; {
description = "Tiny command line DNS client with support for UDP, TCP, DoT, DoH, DoQ and ODoH";
homepage = "https://github.com/natesales/q";
license = licenses.gpl3;
maintainers = with maintainers; [ fliegendewurst ];
};
}