From ca4b1a0b3fe6a5f88ab074d1557c181fdb532836 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 26 Mar 2020 19:54:34 +0530 Subject: [PATCH] Remove libc package This needs to be done properly at the overlay --- packages/default.nix | 2 -- packages/libc/default.nix | 23 ----------------------- packages/libc/libc.pc | 9 --------- packages/libc/libm.pc | 8 -------- 4 files changed, 42 deletions(-) delete mode 100644 packages/libc/default.nix delete mode 100644 packages/libc/libc.pc delete mode 100644 packages/libc/libm.pc diff --git a/packages/default.nix b/packages/default.nix index 8fca157..9585cef 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -105,8 +105,6 @@ in rec { NOVA = legacyPackages.callPackage ./NOVA { }; - libc = callPackage' ./libc { inherit depot; }; - solo5 = let drv = callPackage' ./solo5 { }; in drv // { tests = addManifest drv.tests // { pname = "solo5-tests"; }; }; diff --git a/packages/libc/default.nix b/packages/libc/default.nix deleted file mode 100644 index f4b8896..0000000 --- a/packages/libc/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: CC0-1.0 - -{ stdenvNoCC, depot }: - -let stdenv = stdenvNoCC; - -in stdenv.mkDerivation { - pname = "libc"; - version = "12.0.0"; - outputs = [ "out" "dev" ]; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - installPhase = '' - cp -r ${depot.libc} $out - mkdir -p $dev/lib/pkgconfig - substituteAll ${./libc.pc} libc.pc - substituteAll ${./libm.pc} libm.pc - install -Dt $dev/lib/pkgconfig *.pc - ''; -} diff --git a/packages/libc/libc.pc b/packages/libc/libc.pc deleted file mode 100644 index d6dd745..0000000 --- a/packages/libc/libc.pc +++ /dev/null @@ -1,9 +0,0 @@ -libdir=@out@/lib - -Name: genode-libc -Description: Genode C runtime library -URL: https://genode.org/ -Version: @version@ -Requires: vfs -Cflags: -D__FreeBSD__=8 -D__ISO_C_VISIBLE=1999 -fno-builtin-sin -fno-builtin-cos -fno-builtin-sinf -fno-builtin-cosf -Libs: -L${libdir} -l:libc.lib.so diff --git a/packages/libc/libm.pc b/packages/libc/libm.pc deleted file mode 100644 index 78e41ba..0000000 --- a/packages/libc/libm.pc +++ /dev/null @@ -1,8 +0,0 @@ -libdir=@out@/lib - -Name: genode-libm -Description: Genode math library -URL: https://genode.org/ -Version: @version@ -Requires: libc -Libs: -L${libdir} -l:libm.lib.so