diff --git a/pkgs/pseint.nix b/pkgs/pseint.nix index 2351d94..bb33842 100644 --- a/pkgs/pseint.nix +++ b/pkgs/pseint.nix @@ -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/"; diff --git a/roles/school/services/default.nix b/roles/school/services/default.nix index 1e5b9bb..69a706a 100644 --- a/roles/school/services/default.nix +++ b/roles/school/services/default.nix @@ -3,6 +3,5 @@ { imports = [ ./syncthing.nix - ./mysql.nix ]; } diff --git a/roles/school/services/mysql.nix b/roles/school/services/mysql.nix deleted file mode 100644 index 6387afa..0000000 --- a/roles/school/services/mysql.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.mysql = { - enable = true; - package = pkgs.mysql80; - user = "toast"; - group = "users"; - }; - - environment.systemPackages = [ pkgs.mysql-workbench ]; -}