libk  Diff

Differences From Artifact [09f8c0f00b]:

• File dist/libk.nix — part of check-in [49b6e9c7f6] at 2019-08-21 06:43:51 on branch trunk — create dist folder for OS-specific supporting build files (user: lexi, size: 919) [annotate] [blame] [check-ins using]
• File libk.nix — part of check-in [a26e579866] at 2019-08-21 04:50:41 on branch trunk — Add initial build setup for Nix (user: glow, size: 919) [annotate] [blame] [check-ins using]

To Artifact [5ae929ce03]:

• File dist/libk.nix — part of check-in [009b0289f2] at 2019-11-01 06:28:50 on branch trunk — Mostly fix NixOS build. Docs are still broken. The rest of the problems, mostly from small changes since NixOS was last tested, are fixed. (user: glowpelt, size: 1378) [annotate] [blame] [check-ins using]

     1         -{stdenv, m4, yasm}:
            1  +{stdenv, m4, yasm, cmark, groff}:
     2      2   
     3      3   stdenv.mkDerivation {
     4      4     name = "libk";
     5      5     version = "0.0.0";
     6      6   
     7         -  src = stdenv.lib.cleanSource ./.;
            7  +  src = stdenv.lib.cleanSource ../.;
     8      8   
     9         -  nativeBuildInputs = [ m4 yasm ];
            9  +  # Need to figure out how split builds work... but that also kinda needs
           10  +  # an install script first, so.
           11  +  nativeBuildInputs = [ m4 yasm cmark groff ];
    10     12   
           13  +  # TODO: maybe make this more generic? IIRC I couldn't use the
           14  +  # patch-everything whatever, for some reason. It also probably should be in
           15  +  # an earlier build step.
    11     16     buildPhase = ''
    12         -    substituteInPlace global/build-id.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
    13         -    substituteInPlace global/build-manpage.sh --replace "/usr/bin/env sh" "${stdenv.shell}"
           17  +    substituteInPlace global/build-id.sh --replace "/usr/bin/env bash" "${stdenv.shell}"
           18  +    substituteInPlace global/build-manpage.sh --replace "/usr/bin/env bash" "${stdenv.shell}"
    14     19       env os=lin arch=x86 bits=64 to=$prefix debug=yes \
    15     20       bash build.sh
    16     21     '';
    17     22   
    18     23     # No proper install yet...
    19     24     dontInstall = true;
    20     25   
    21         -  # This doesn't seem to work anyways?
           26  +  # Not sure if these work or are needed, but better safe than sorry, here.
    22     27     dontStrip = true;
    23     28     dontPatchELF = true;
    24     29   
           30  +  # I think there's supposed to be a stack check fail fn now, so maybe this
           31  +  # is okay? TODO: test if this is still needed.
    25     32     hardeningDisable = [ "stackprotector" ];
    26     33   
    27     34     meta = with stdenv.lib; {
    28     35       description = "A modern replacement for libc";
    29         -    homepage = https://c.hale.su/lexi/libk;
    30         -    changelog = "https://c.hale.su/lexi/libk/timeline";
           36  +    homepage = https://c.hale.su/libk;
           37  +    changelog = "https://c.hale.su/libk/timeline";
    31     38       license = licenses.agpl3;
    32     39       # Doesn't actually match w/ supported platforms, but...
    33     40       platforms = platforms.unix;
    34     41     };
    35     42   }