diff --git a/flake.nix b/flake.nix index a627754..5a0c8f1 100644 --- a/flake.nix +++ b/flake.nix @@ -105,7 +105,6 @@ }; packages = { x86_64-linux = with import nixpkgs-unstable-raw { system = "x86_64-linux"; }; { - pseint = callPackage ./pkgs/pseint.nix {}; anything-sync-daemon = callPackage ./pkgs/anything-sync-daemon {}; discord-krisp-fixer = callPackage ./pkgs/discord-krisp-fixer {}; }; diff --git a/pkgs/pseint.nix b/pkgs/pseint.nix deleted file mode 100644 index 2351d94..0000000 --- a/pkgs/pseint.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, lib -, fetchurl -, wxGTK32 -, libX11 -, libglvnd -, libGLU -, gsettings-desktop-schemas -, makeBinaryWrapper -, makeDesktopItem -, wrapGAppsHook -}: -# Based on https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pseint -stdenv.mkDerivation rec { - pname = "pseint"; - version = "20230517"; - - src = fetchurl { - 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 ]; - - nativeBuildInputs = [ makeBinaryWrapper wrapGAppsHook ]; - - # Build for linux - makeFlags = [ "ARCH=lnx" ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/${pname}/ $out/bin/ $out/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128} - 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" - - 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/"; - downloadPage = "https://pseint.sourceforge.net/index.php?page=descargas.php"; - changelog = "https://pseint.sourceforge.net/index.php?page=cambios.php"; - # Website says GPLv2, so I'm assuming I need to use gpl2Only - license = lib.licenses.gpl2Only; - platforms = platforms.linux; - }; -} diff --git a/roles/school/programs/default.nix b/roles/school/programs/default.nix index 24dba3a..6579783 100644 --- a/roles/school/programs/default.nix +++ b/roles/school/programs/default.nix @@ -1,4 +1,4 @@ - { config, pkgs, flakeSelf, ... }: + { config, pkgs, ... }: { imports = [ @@ -9,6 +9,5 @@ environment.systemPackages = with pkgs; [ dia - flakeSelf.packages.x86_64-linux.pseint ]; }