diff --git a/flake.nix b/flake.nix index dfa59fa..0e80695 100755 --- a/flake.nix +++ b/flake.nix @@ -63,11 +63,7 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager- export PS1="$PS1(toast-configs)> " ''; }; - packages = { - x86_64-linux = with import nixpkgs-unstable { system = "x86_64-linux"; }; { - pseint = callPackage ./pkgs/pseint.nix {}; - }; - }; + nixosConfigurations = { Archie = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; @@ -86,7 +82,6 @@ outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager- ./roles/desktop ./roles/kde ./roles/gaming - ./roles/school ./machines/Archie ]; }; diff --git a/pkgs/pseint.nix b/pkgs/pseint.nix deleted file mode 100644 index bb33842..0000000 --- a/pkgs/pseint.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, lib -, fetchurl -, wxGTK32 -, libX11 -, libglvnd -, libGLU -, gsettings-desktop-schemas -, makeBinaryWrapper -, 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/ - cp -rv bin/* $out/opt/${pname}/ - makeBinaryWrapper $out/opt/${pname}/pseint $out/bin/pseint - - runHook postInstall - ''; - - 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 77b1415..816fade 100644 --- a/roles/school/programs/default.nix +++ b/roles/school/programs/default.nix @@ -1,4 +1,4 @@ - { config, pkgs, flakeSelf, ... }: + { config, pkgs, ... }: { imports = [ @@ -7,6 +7,5 @@ environment.systemPackages = with pkgs; [ dia - flakeSelf.packages.x86_64-linux.pseint ]; }