Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:2040a00a022052b2a971e5aa0c41175aa63fe6fd
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
..
compare: Toast:1c9dced21cdac007582e785de61f08ff4aa9649e
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

No commits in common. "2040a00a022052b2a971e5aa0c41175aa63fe6fd" and "1c9dced21cdac007582e785de61f08ff4aa9649e" have entirely different histories.
2040a00a02 ... 1c9dced21c

3 changed files with 3 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pkgs/pseint.nix
View file

@ -7,7 +7,6 @@
, libGLU
, gsettings-desktop-schemas
, makeBinaryWrapper
, makeDesktopItem
, wrapGAppsHook
}:
# Based on https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pseint
@ -19,6 +18,7 @@ stdenv.mkDerivation rec {
url = "https://netactuate.dl.sourceforge.net/project/${pname}/${version}/${pname}-src-${version}.tgz";
hash = "sha256-8zc7CtDQ9RjXLAVQTigstPqdDJsR8ffBopxBFzVP+eI=";
};
enableParallelBuilding = true;
buildInputs = [ wxGTK32 libglvnd libGLU libX11 gsettings-desktop-schemas ];
@ -31,29 +31,13 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
mkdir -p $out/opt/${pname}/ $out/bin/ $out/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128}
mkdir -p $out/opt/${pname}/ $out/bin/
cp -rv bin/* $out/opt/${pname}/
makeBinaryWrapper $out/opt/${pname}/wxPSeInt $out/bin/pseint
cp -rv bin/imgs/icon16.png $out/share/icons/hicolor/16x16/pseint.png
cp -rv bin/imgs/icon32.png $out/share/icons/hicolor/32x32/pseint.png
cp -rv bin/imgs/icon48.png $out/share/icons/hicolor/48x48/pseint.png
cp -rv bin/imgs/icon64.png $out/share/icons/hicolor/64x64/pseint.png
cp -rv bin/imgs/icon128.png $out/share/icons/hicolor/128x128/pseint.png
cp -rv "${desktopItem}/share/applications" "$out/share"
makeBinaryWrapper $out/opt/${pname}/pseint $out/bin/pseint
runHook postInstall
'';
desktopItem = makeDesktopItem {
name = pname;
desktopName = "PSeInt";
exec = "pseint";
icon = "pseint";
genericName = meta.description;
categories = [ "Development" ];
};
meta = with lib; {
description = "A tool for learning programming basis with a simple spanish pseudocode";
homepage = "https://pseint.sourceforge.net/";

1
roles/school/services/default.nix
View file

@ -3,6 +3,5 @@
{
imports = [
./syncthing.nix
./mysql.nix
];
}

12
roles/school/services/mysql.nix
View file

@ -1,12 +0,0 @@
{ config, pkgs, ... }:
{
services.mysql = {
enable = true;
package = pkgs.mysql80;
user = "toast";
group = "users";
};
environment.systemPackages = [ pkgs.mysql-workbench ];
}