diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | configuration.nix | 14 | ||||
| -rw-r--r-- | packages/st/pkg.nix | 19 | ||||
| m--------- | packages/st/source | 0 |
4 files changed, 24 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index 3476ae8..6eea2e8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "packages/dwm/source"] path = packages/dwm/source url = git@github.com:phenax/dwm.git +[submodule "packages/st/source"] + path = packages/st/source + url = git@github.com:phenax/st.git diff --git a/configuration.nix b/configuration.nix index 36301f1..4e31653 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,6 +9,7 @@ let sensible-apps = pkgs.callPackage ./packages/sensible-apps/pkg.nix {}; shotkey = pkgs.callPackage ./packages/shotkey/pkg.nix {}; dwm = pkgs.callPackage ./packages/dwm/pkg.nix {}; + st = pkgs.callPackage ./packages/st/pkg.nix {}; in { imports = [ ./hardware-configuration.nix @@ -64,15 +65,6 @@ in { # xkbOptions = "eurosign:e"; }; - # nixpkgs.config.packageOverrides = pkgs: { - # dwm = pkgs.dwm.overrideAttrs (_: { - # src = builtins.fetchGit { - # url = "https://github.com/phenax/dwm"; - # ref = "master"; - # }; - # }); - # }; - # Enable CUPS to print documents. # services.printing.enable = true; @@ -128,9 +120,6 @@ in { nodejs-15_x yarn - # dwm - st - mtm xorg.xinit firefox @@ -145,6 +134,7 @@ in { sensible-apps shotkey dwm + st pass xcwd diff --git a/packages/st/pkg.nix b/packages/st/pkg.nix new file mode 100644 index 0000000..3931819 --- /dev/null +++ b/packages/st/pkg.nix @@ -0,0 +1,19 @@ +{ stdenv, libX11, libXinerama, libXft, fontconfig, pkgconfig, ncurses }: +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "local-st-${version}"; + version = "0.8.4"; + + src = ./source; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXft fontconfig ncurses ]; + + + unpackPhase = ''cp -r $src/* .''; + + buildPhase = ''make''; + + installPhase = ''TERMINFO=$out/share/terminfo make PREFIX=$out DESTDIR="" install''; +} diff --git a/packages/st/source b/packages/st/source new file mode 160000 +Subproject cfffcbc128af5eaff37d54750432e34762ec88f |