Unverified Commit 498ea1c8 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #323414 from obsidiansystems/openbsd-libc-minimal 

openbsd.libc: Create from constituent pkgs not hack
parents 14adad6f 56c2439a

pkgs/os-specific/bsd/netbsd/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ makeScopeWithSplicing' { 
      stdenvLibcMinimal = crossLibcStdenv.override (old: {

        cc = old.cc.override {

          libc = self.libcMinimal;

          noLibc = false;

          bintools = old.cc.bintools.override {

            libc = self.libcMinimal;

            noLibc = false;

            sharedLibraryLoader = null;

          };

        };

pkgs/os-specific/bsd/netbsd/pkgs/libpthread/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  lib,

  stdenvLibcMinimal,

  mkDerivation,

  headers,

  libcMinimal,

  librt,

}:

pkgs/os-specific/bsd/netbsd/pkgs/libutil.nix

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
  lorder,

  mandoc,

  statHook,

  headers,

}:



mkDerivation {

pkgs/os-specific/bsd/openbsd/default.nix

+55 −14
Original line number Diff line number Diff line 
{

  lib,

  crossLibcStdenv,

  stdenvNoCC,

  makeScopeWithSplicing',

  generateSplicesForMkScope,

  buildPackages,
@@ -19,32 +21,71 @@ makeScopeWithSplicing' { 
      directory = ./pkgs;

    }

    // {

      libc = self.callPackage ./pkgs/libc/package.nix {

        inherit (self) csu include;

        inherit (buildOpenbsd) makeMinimal;

        inherit (buildPackages.netbsd)

          install

          gencat

          rpcgen

          tsort

          ;

      version = "7.5";



      stdenvLibcMinimal = crossLibcStdenv.override (old: {

        cc = old.cc.override {

          libc = self.libcMinimal;

          noLibc = false;

          bintools = old.cc.bintools.override {

            libc = self.libcMinimal;

            noLibc = false;

            sharedLibraryLoader = null;

          };

      makeMinimal = buildPackages.netbsd.makeMinimal.override { inherit (self) make-rules; };

      mkDerivation = self.callPackage ./pkgs/mkDerivation.nix {

        inherit (buildPackages.netbsd) install;

        inherit (buildPackages.buildPackages) rsync;

        };

      });



      makeMinimal = buildPackages.netbsd.makeMinimal.override { inherit (self) make-rules; };



      # The manual callPackages below should in principle be unnecessary, but are

      # necessary. See note in ../netbsd/default.nix



      include = self.callPackage ./pkgs/include/package.nix {

        inherit (buildOpenbsd) makeMinimal;

        inherit (buildPackages.netbsd) install rpcgen mtree;

      };



      csu = self.callPackage ./pkgs/csu.nix {

        inherit (self) include;

        inherit (buildOpenbsd) makeMinimal;

        inherit (buildPackages.netbsd) install;

      };

      make-rules = self.callPackage ./pkgs/make-rules/package.nix { };



      libcMinimal = self.callPackage ./pkgs/libcMinimal/package.nix {

        inherit (self) csu include;

        inherit (buildOpenbsd) makeMinimal;

        inherit (buildPackages.netbsd)

          install

          gencat

          tsort

          rpcgen

          ;

      };



      librpcsvc = self.callPackage ./pkgs/librpcsvc.nix {

        inherit (buildOpenbsd) openbsdSetupHook makeMinimal lorder;

        inherit (buildPackages.netbsd)

          install

          tsort

          statHook

          rpcgen

          ;

      };



      libutil = self.callPackage ./pkgs/libutil.nix {

        inherit (self) libcMinimal;

        inherit (buildOpenbsd) openbsdSetupHook makeMinimal lorder;

        inherit (buildPackages.netbsd) install tsort statHook;

      };



      lorder = self.callPackage ./pkgs/lorder.nix { inherit (buildPackages.netbsd) install; };



      make-rules = self.callPackage ./pkgs/make-rules/package.nix { };



      mkDerivation = self.callPackage ./pkgs/mkDerivation.nix {

        inherit (buildPackages.netbsd) install tsort;

        inherit (buildPackages.buildPackages) rsync;

      };

    }

  );

}

pkgs/os-specific/bsd/openbsd/pkgs/libc.nix

0 → 100644
+47 −0
Original line number Diff line number Diff line 
{

  lib,

  symlinkJoin,

  libcMinimal,

  librthread,

  libm,

  librpcsvc,

  libutil,

  version,

}:



symlinkJoin rec {

  name = "${pname}-${version}";

  pname = "libc-openbsd";

  inherit version;



  outputs = [

    "out"

    "dev"

    "man"

  ];



  paths =

    lib.concatMap

      (p: [

        (lib.getDev p)

        (lib.getLib p)

        (lib.getMan p)

      ])

      [

        libcMinimal

        libm

        librthread

        librpcsvc

        libutil

      ];



  postBuild = ''

    rm -r "$out/nix-support"

    mkdir -p "$man/share/man"

    mv "$out/share"/man* "$man/share/man"

    rmdir "$out/share"

    fixupPhase

  '';



  meta.platforms = lib.platforms.openbsd;

}