diff options
| author | Arslaan Pathan <[email protected]> | 2026-06-11 18:34:11 +1200 |
|---|---|---|
| committer | Arslaan Pathan <[email protected]> | 2026-06-11 18:34:11 +1200 |
| commit | 46a968ee47dee51bd9602afc80c09ee592f59749 (patch) | |
| tree | 2ac9a2be3537055042a3cb8c15ae94c14bfd8341 | |
| parent | 706ecb87cc51c827e1ee1765da587f6c270d72f3 (diff) | |
| download | yerbalinux-46a968ee47dee51bd9602afc80c09ee592f59749.tar.xz yerbalinux-46a968ee47dee51bd9602afc80c09ee592f59749.zip | |
Finish zsh and PLEASE PLEASE NIX STOP LINKING TO NIX STORE FOR LIBC
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | nix/zsh.nix | 25 |
3 files changed, 29 insertions, 4 deletions
@@ -1,3 +1,4 @@ external build result +result-man @@ -8,6 +8,12 @@ pkgs = nixpkgs.legacyPackages.${system}; pkgsStatic = nixpkgs.legacyPackages.${system}.pkgsStatic; pkgsMusl = nixpkgs.legacyPackages.${system}.pkgsMusl; + actuallyGoodPkgsMuslThatDoesntMakeMeWantToSmashMyHeadAgainstAWall = import nixpkgs { + localSystem = { + system = "x86_64-linux"; + config = "x86_64-unknown-linux-musl"; + }; + }; in { devShells.${system}.default = pkgs.mkShell { buildInputs = with pkgs; [ gcc clang gnumake xorriso cpio ]; @@ -19,6 +25,7 @@ inherit (pkgs) pkgsStatic; }; runit = pkgsStatic.runit; + zsh = actuallyGoodPkgsMuslThatDoesntMakeMeWantToSmashMyHeadAgainstAWall.callPackage ./nix/zsh.nix {}; limine = pkgs.callPackage ./nix/limine.nix {}; initramfs = pkgs.callPackage ./nix/initramfs.nix { inherit (self.packages.${system}) kernel busybox; diff --git a/nix/zsh.nix b/nix/zsh.nix index a3feb2b..b9afca5 100644 --- a/nix/zsh.nix +++ b/nix/zsh.nix @@ -1,10 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation { name = "zsh-yerba"; src = fetchurl { - url = "https://sourceforge.net/projects/zsh/files/zsh/5.9.1/zsh-5.9.1.tar.xz/download"; - hash = ""; + url = "https://www.zsh.org/pub/zsh-5.9.1.tar.xz"; + hash = "sha256-XSC+wD+YHcTpoJ7CRedBU4j/ZB95xcXEFrUELljYKA0= +"; }; - # Do this later + CFLAGS = "-O0"; + buildInputs = [ ncurses ]; + nativeBuildInputs = [ ncurses ]; + configureFlags = [ + "--prefix=/usr" + "--disable-rpath" + ]; + configurePhase = '' + ./configure --prefix=/usr --disable-rpath + ''; + buildPhase = '' + make -j$NIX_BUILD_CORES + ''; + installPhase = '' + mkdir -p $out + make install DESTDIR=$out/_install + ''; } |