Compare commits

..

No commits in common. "5a6780bf719dec0c1561891400c6f770bcbfe1ec" and "6ccd0bc0f72dd7aec38eaa185b7f6657650f6c1f" have entirely different histories.

2 changed files with 11 additions and 7 deletions

View File

@ -23,10 +23,10 @@ rec {
openscad-snapshot = pkgs.callPackage ./pkgs/openscad-snapshot { }; openscad-snapshot = pkgs.callPackage ./pkgs/openscad-snapshot { };
# 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 { };
#ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all { ripgrep-all = pkgs.callPackage ./pkgs/ripgrep-all {
# inherit (pkgs.darwin.apple_sdk.frameworks) Security; inherit (pkgs.darwin.apple_sdk.frameworks) Security;
#}; };
sddm-theme-utah = pkgs.callPackage ./pkgs/sddm-theme-utah { }; sddm-theme-utah = pkgs.callPackage ./pkgs/sddm-theme-utah { };
thumbs = pkgs.callPackage ./pkgs/thumbs { }; thumbs = pkgs.callPackage ./pkgs/thumbs { };
tmux-thumbs = pkgs.callPackage ./pkgs/tmux-thumbs { tmux-thumbs = pkgs.callPackage ./pkgs/tmux-thumbs {

View File

@ -1,11 +1,11 @@
{ lib, fetchurl, appimageTools, openscad, makeDesktopItem }: { lib, fetchurl, appimageTools, openscad, makeWrapper, makeDesktopItem }:
let let
pname = "openscad"; pname = "openscad";
version = "2024.10.23.ai20994"; version = "2023.08.25.ai16051";
src = fetchurl { src = fetchurl {
url = "https://files.openscad.org/snapshots/OpenSCAD-${version}-x86_64.AppImage"; url = "https://files.openscad.org/snapshots/OpenSCAD-${version}-x86_64.AppImage";
hash = "sha256-2iltY9JcyfCn6IvoSRBlZy3ugt8UWjchYp3B7nW8hMo="; sha256 = "sha256-mEGmkL2lL7JxK0nRPLtnfg4vxtkK3URz351eyuRHZPE=";
}; };
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
@ -26,6 +26,10 @@ appimageTools.wrapType2 {
inherit pname version src; inherit pname version src;
extraInstallCommands = '' extraInstallCommands = ''
source "${makeWrapper}/nix-support/setup-hook"
wrapProgram $out/bin/${pname}-${version} \
--unset QT_PLUGIN_PATH
mkdir -p $out/share mkdir -p $out/share
cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons
''; '';