diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/rootfs.nix | 6 | ||||
| -rw-r--r-- | nix/tcc.nix | 29 |
2 files changed, 1 insertions, 34 deletions
diff --git a/nix/rootfs.nix b/nix/rootfs.nix index 3f64eaa..34f1b4e 100644 --- a/nix/rootfs.nix +++ b/nix/rootfs.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, busybox, tcc, squashfsTools, linuxHeaders, musl }: +{ stdenv, fetchgit, busybox, squashfsTools, linuxHeaders, musl }: stdenv.mkDerivation { name = "rootfs-yerba"; @@ -28,10 +28,6 @@ stdenv.mkDerivation { # Busybox end # Programs start - cp -a ${tcc}/bin/* rootfs/usr/bin/ 2>/dev/null || true - cp -a ${tcc}/lib/* rootfs/usr/lib/ 2>/dev/null || true - chmod -R u+w rootfs - ln -sf /usr/bin/tcc rootfs/usr/bin/cc # Programs end # Basic files setup start diff --git a/nix/tcc.nix b/nix/tcc.nix deleted file mode 100644 index cd4cf27..0000000 --- a/nix/tcc.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchgit, musl, linuxHeaders }: - -stdenv.mkDerivation { - name = "tcc-yerba"; - src = fetchgit { - url = "https://repo.or.cz/tinycc.git"; - rev = "34eed88a"; - hash = "nix will yell at me but then i fix it"; - }; - - configureFlags = [ - "--cc=gcc" - "--ar=ar" - "--config-musl" - "--crtprefix=${musl}/lib" - "--sysincludepaths=${linuxHeaders}/include:{B}/include" - "--libpaths=${musl}/lib" - ]; - - buildPhase = '' - make -j$NIX_BUILD_CORES - ''; - - installPhase = '' - mkdir -p $out/bin $out/lib - cp tcc $out/bin/ - cp libtcc.a $out/lib/ 2>/dev/null || true - ''; -} |