commit 06b05d2289599dd434b6991fa25685ce5cb9a136 · pyrox.dev/nixpkgs

+2

lib/systems/default.nix

···

       81
       81
        
               && final.parsed.kernel == platform.parsed.kernel;

     

       82
       82
        
             isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details";

     

       83
       83
        
             # Derived meta-data

     

       84
       84
       +
             useLLVM = final.isFreeBSD;

     

       85
       85
       +
       

     

       84
       86
        
             libc =

     

       85
       87
        
               /**/ if final.isDarwin              then "libSystem"

     

       86
       88
        
               else if final.isMinGW               then "msvcrt"

+21 -7

pkgs/os-specific/bsd/freebsd/package-set.nix

···

       17
       17
        
       }

     

       18
       18
        
       // {

     

       19
       19
        
         inherit sourceData patchesRoot versionData;

     

       20
       20
       +
         patches = ./patches/${self.versionData.revision};

     

       20
       21
        
       

     

       21
       22
        
         # Keep the crawled portion of Nixpkgs finite.

     

       22
       23
        
         buildFreebsd = lib.dontRecurseIntoAttrs buildFreebsd;

     
···

       26
       27
        
           sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E=";

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       29
       -
         compatIfNeeded = lib.optional (!stdenvNoCC.hostPlatform.isFreeBSD) self.compat;

     

       30
       30
       +
         compatIsNeeded = !stdenvNoCC.hostPlatform.isFreeBSD;

     

       31
       31
       +
         compatIfNeeded = lib.optional self.compatIsNeeded self.compat;

     

       30
       32
        
         freebsd-lib = import ./lib {

     

       31
       33
        
           version = lib.concatStringsSep "." (

     

       32
       34
        
             map toString (

     
···

       44
       46
        
       

     

       45
       47
        
         compat = self.callPackage ./pkgs/compat/package.nix {

     

       46
       48
        
           inherit stdenv;

     

       47
       47
       -
           inherit (buildFreebsd) makeMinimal boot-install;

     

       49
       49
       +
           inherit (buildFreebsd) makeMinimal;

     

       48
       50
        
         };

     

       49
       51
        
       

     

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

     
···

       52
       54
        
           inherit (self) include;

     

       53
       55
        
         };

     

       54
       56
        
       

     

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

     

       56
       56
       -
           inherit (buildFreebsd) makeMinimal install rpcgen;

     

       57
       57
       -
         };

     

       57
       57
       +
         include = self.callPackage ./pkgs/include/package.nix { inherit (buildFreebsd) rpcgen mtree; };

     

       58
       58
        
       

     

       59
       59
        
         install = self.callPackage ./pkgs/install.nix {

     

       60
       60
        
           inherit (buildFreebsd) makeMinimal;

     

       61
       61
       -
           inherit (self) mtree libnetbsd;

     

       61
       61
       +
           inherit (self) libmd libnetbsd;

     

       62
       62
        
         };

     

       63
       63
        
       

     

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

     
···

       67
       67
        
             install

     

       68
       68
        
             gencat

     

       69
       69
        
             rpcgen

     

       70
       70
       +
             mkcsmapper

     

       71
       71
       +
             mkesdb

     

       70
       72
        
             ;

     

       71
       73
        
           inherit (self) csu include;

     

       72
       74
        
         };

     

       73
       75
        
       

     

       74
       76
        
         libnetbsd = self.callPackage ./pkgs/libnetbsd/package.nix { inherit (buildFreebsd) makeMinimal; };

     

       75
       77
        
       

     

       78
       78
       +
         libmd = self.callPackage ./pkgs/libmd.nix { inherit (buildFreebsd) makeMinimal; };

     

       79
       79
       +
       

     

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

     

       77
       81
        
           inherit stdenv;

     

       78
       78
       -
           inherit (buildFreebsd) makeMinimal install tsort;

     

       82
       82
       +
           inherit (buildFreebsd)

     

       83
       83
       +
             freebsdSetupHook

     

       84
       84
       +
             makeMinimal

     

       85
       85
       +
             install

     

       86
       86
       +
             tsort

     

       87
       87
       +
             lorder

     

       88
       88
       +
             ;

     

       79
       89
        
         };

     

       80
       90
        
       

     

       81
       91
        
         makeMinimal = self.callPackage ./pkgs/makeMinimal.nix { inherit (self) make; };

     

       92
       92
       +
       

     

       93
       93
       +
         mtree = self.callPackage ./pkgs/mtree.nix { inherit (self) libnetbsd libmd; };

     

       94
       94
       +
       

     

       95
       95
       +
         tsort = self.callPackage ./pkgs/tsort.nix { inherit (buildFreebsd) makeMinimal install; };

     

       82
       96
        
       }

+13

pkgs/os-specific/bsd/freebsd/patches/13.1/mtree-Makefile.patch

···

       1
       1
       +
       --- a/contrib/mtree/Makefile	2023-12-04 23:02:13.919144141 -0700

     

       2
       2
       +
       +++ b/contrib/mtree/Makefile		2023-12-04 23:02:58.371810109 -0700

     

       3
       3
       +
       @@ -10,8 +10,8 @@

     

       4
       4
       +
        SRCS=  compare.c crc.c create.c excludes.c misc.c mtree.c spec.c specspec.c \

     

       5
       5
       +
               verify.c getid.c pack_dev.c only.c

     

       6
       6
       +
        .if (${HOSTPROG:U} == "")

     

       7
       7
       +
       -DPADD+= ${LIBUTIL}

     

       8
       8
       +
       -LDADD+= -lutil

     

       9
       9
       +
       +LIBADD+= ${LIBUTIL}

     

       10
       10
       +
       +#LIBADD+= -lutil

     

       11
       11
       +
        .endif

     

       12
       12
       +
       

     

       13
       13
       +
        CPPFLAGS+=	-I${NETBSDSRCDIR}/sbin/mknod

pkgs/os-specific/bsd/freebsd/patches/13.1/rpcgen-glibc-hack.patch pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/rpcgen-glibc-hack.patch

+17 -7

pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         mkDerivation,

     

       5
       5
       -
         patchesRoot,

     

       5
       5
       +
         versionData,

     

       6
       6
        
         bsdSetupHook,

     

       7
       7
        
         freebsdSetupHook,

     

       8
       8
        
         makeMinimal,

     
···

       17
       17
        
         inherit (freebsd-lib) mkBsdArch;

     

       18
       18
        
       in

     

       19
       19
        
       

     

       20
       20
       -
       mkDerivation rec {

     

       20
       20
       +
       mkDerivation {

     

       21
       21
        
         pname = "compat";

     

       22
       22
        
         path = "tools/build";

     

       23
       23
        
         extraPaths =

     
···

       80
       80
        
             "sys/sys/font.h"

     

       81
       81
        
             "sys/sys/consio.h"

     

       82
       82
        
             "sys/sys/fnv_hash.h"

     

       83
       83
       +
             #"sys/sys/cdefs.h"

     

       84
       84
       +
             #"sys/sys/param.h"

     

       85
       85
       +
             "sys/sys/_null.h"

     

       86
       86
       +
             #"sys/sys/types.h"

     

       87
       87
       +
             "sys/sys/_pthreadtypes.h"

     

       88
       88
       +
             "sys/sys/_stdint.h"

     

       83
       89
        
       

     

       84
       90
        
             "sys/crypto/chacha20/_chacha.h"

     

       85
       91
        
             "sys/crypto/chacha20/chacha.h"

     
···

       92
       98
        
       

     

       93
       99
        
             "lib/libcapsicum"

     

       94
       100
        
             "lib/libcasper"

     

       95
       95
       -
           ];

     

       101
       101
       +
             "lib/libmd"

     

       96
       102
        
       

     

       97
       97
       -
         patches = [

     

       98
       98
       -
           /${patchesRoot}/compat-install-dirs.patch

     

       99
       99
       -
           /${patchesRoot}/compat-fix-typedefs-locations.patch

     

       100
       100
       -
         ];

     

       103
       103
       +
             # idk bro

     

       104
       104
       +
             "sys/sys/kbio.h"

     

       105
       105
       +
           ];

     

       101
       106
        
       

     

       102
       107
        
         preBuild =

     

       103
       108
        
           ''

     
···

       151
       156
        
           + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       152
       157
        
             cp --no-preserve=mode -r cross-build/include/darwin/* $out/1-include

     

       153
       158
        
           '';

     

       159
       159
       +
       

     

       160
       160
       +
         # Compat is for making other platforms look like FreeBSD (e.g. to

     

       161
       161
       +
         # build build-time dependencies for building FreeBSD packages). It is

     

       162
       162
       +
         # not needed when building for FreeBSD.

     

       163
       163
       +
         meta.broken = stdenv.hostPlatform.isFreeBSD;

     

       154
       164
        
       }

+1

pkgs/os-specific/bsd/freebsd/pkgs/csu.nix

···

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       mkDerivation {

     

       15
       15
       +
         isStatic = true;

     

       15
       16
        
         path = "lib/csu";

     

       16
       17
        
         extraPaths = [

     

       17
       18
        
           "lib/Makefile.inc"

+6 -17

pkgs/os-specific/bsd/freebsd/pkgs/ctfconvert.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       3
        
         mkDerivation,

     

       5
       5
       -
         bsdSetupHook,

     

       6
       6
       -
         freebsdSetupHook,

     

       7
       7
       -
         makeMinimal,

     

       8
       8
       -
         install,

     

       9
       9
       -
         mandoc,

     

       10
       10
       -
         groff,

     

       11
       4
        
         compatIfNeeded,

     

       12
       12
       -
         libelf,

     

       13
       5
        
         libdwarf,

     

       14
       6
        
         zlib,

     

       15
       7
        
         libspl,

     
···

       26
       18
        
         ];

     

       27
       19
        
         OPENSOLARIS_USR_DISTDIR = "$(SRCTOP)/cddl/contrib/opensolaris";

     

       28
       20
        
         OPENSOLARIS_SYS_DISTDIR = "$(SRCTOP)/sys/cddl/contrib/opensolaris";

     

       29
       29
       -
         nativeBuildInputs = [

     

       30
       30
       -
           bsdSetupHook

     

       31
       31
       -
           freebsdSetupHook

     

       32
       32
       -
           makeMinimal

     

       33
       33
       -
           install

     

       34
       34
       -
           mandoc

     

       35
       35
       -
           groff

     

       36
       21
        
       

     

       37
       37
       -
           # flex byacc file2c

     

       22
       22
       +
         makeFlags = [

     

       23
       23
       +
           "STRIP=-s"

     

       24
       24
       +
           "MK_WERROR=no"

     

       25
       25
       +
           "MK_TESTS=no"

     

       38
       26
        
         ];

     

       27
       27
       +
       

     

       39
       28
        
         buildInputs = compatIfNeeded ++ [

     

       40
       40
       -
           libelf

     

       41
       29
        
           libdwarf

     

       42
       30
        
           zlib

     

       43
       31
        
           libspl

     

       44
       32
        
         ];

     

       33
       33
       +
       

     

       45
       34
        
         meta.license = lib.licenses.cddl;

     

       46
       35
        
       }

+23

pkgs/os-specific/bsd/freebsd/pkgs/filterSource.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgsBuildBuild,

     

       4
       4
       +
         runCommand,

     

       5
       5
       +
         writeText,

     

       6
       6
       +
         source,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       {

     

       10
       10
       +
         pname,

     

       11
       11
       +
         path,

     

       12
       12
       +
         extraPaths ? [ ],

     

       13
       13
       +
       }:

     

       14
       14
       +
       

     

       15
       15
       +
       let

     

       16
       16
       +
         sortedPaths = lib.naturalSort ([ path ] ++ extraPaths);

     

       17
       17
       +
         filterText = writeText "${pname}-src-include" (

     

       18
       18
       +
           lib.concatMapStringsSep "\n" (path: "/${path}") sortedPaths

     

       19
       19
       +
         );

     

       20
       20
       +
       in

     

       21
       21
       +
       runCommand "${pname}-filtered-src" { nativeBuildInputs = [ pkgsBuildBuild.rsync ]; } ''

     

       22
       22
       +
         rsync -a -r --files-from=${filterText} ${source}/ $out

     

       23
       23
       +
       ''

+11

pkgs/os-specific/bsd/freebsd/pkgs/freebsdSetupHook/setup-hook.sh

···

       5
       5
        
       addFreeBSDMakeFlags() {

     

       6
       6
        
         makeFlags="SBINDIR=${!outputBin}/bin $makeFlags"

     

       7
       7
        
         makeFlags="LIBEXECDIR=${!outputLib}/libexec $makeFlags"

     

       8
       8
       +
         makeFlags="LIBDATADIR=${!outputLib}/data $makeFlags"

     

       8
       9
        
         makeFlags="INCLUDEDIR=${!outputDev}/include $makeFlags"

     

       10
       10
       +
         makeFlags="CONFDIR=${!outputBin}/etc $makeFlags"

     

       11
       11
       +
         makeFlags="MANDIR=${!outputMan}/share/man/man $makeFlags"

     

       12
       12
       +
       

     

       13
       13
       +
         if [ -n "$debug" ]; then

     

       14
       14
       +
           makeFlags="DEBUGFILEDIR=${debug}/lib/debug $makeFlags"

     

       15
       15
       +
         else

     

       16
       16
       +
           makeFlags="DEBUGFILEDIR=${out}/lib/debug $makeFlags"

     

       17
       17
       +
         fi

     

       18
       18
       +
       

     

       19
       19
       +
         echo $makeFlags

     

       9
       20
        
       }

     

       10
       21
        
       

     

       11
       22
        
       postUnpackHooks+=(setFreeBSDSrcTop)

+5 -21

pkgs/os-specific/bsd/freebsd/pkgs/include/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         mkDerivation,

     

       4
       4
       -
         patchesRoot,

     

       5
       4
        
         buildPackages,

     

       6
       6
       -
         bsdSetupHook,

     

       7
       7
       -
         freebsdSetupHook,

     

       8
       8
       -
         makeMinimal,

     

       9
       9
       -
         install,

     

       10
       10
       -
         mandoc,

     

       11
       11
       -
         groff,

     

       12
       12
       -
         rsync, # , nbperf

     

       13
       5
        
         rpcgen,

     

       6
       6
       +
         mtree,

     

       14
       7
        
       }:

     

       15
       8
        
       

     

       16
       9
        
       mkDerivation {

     

       10
       10
       +
         isStatic = true;

     

       17
       11
        
         path = "include";

     

       18
       12
        
       

     

       19
       13
        
         extraPaths = [

     
···

       22
       16
        
           "sys"

     

       23
       17
        
         ];

     

       24
       18
        
       

     

       25
       25
       -
         nativeBuildInputs = [

     

       26
       26
       -
           bsdSetupHook

     

       27
       27
       -
           freebsdSetupHook

     

       28
       28
       -
           makeMinimal

     

       29
       29
       -
           install

     

       30
       30
       -
           mandoc

     

       31
       31
       -
           groff

     

       32
       32
       -
           rsync # nbperf

     

       19
       19
       +
         extraNativeBuildInputs = [

     

       33
       20
        
           rpcgen

     

       34
       34
       -
       

     

       35
       35
       -
           # HACK use NetBSD's for now

     

       36
       36
       -
           buildPackages.netbsd.mtree

     

       21
       21
       +
           mtree

     

       37
       22
        
         ];

     

       38
       38
       -
       

     

       39
       39
       -
         patches = [ /${patchesRoot}/no-perms-BSD.include.dist.patch ];

     

       40
       23
        
       

     

       41
       24
        
         # The makefiles define INCSDIR per subdirectory, so we have to set

     

       42
       25
        
         # something else on the command line so those definitions aren't

     
···

       46
       29
        
             sed -i -E \

     

       47
       30
        
               -e 's_/usr/include_''${INCSDIR0}_' \

     

       48
       31
        
               {} \;

     

       32
       32
       +
           sed -E -i -e "/_PATH_LOGIN/d" $BSDSRCDIR/include/paths.h

     

       49
       33
        
         '';

     

       50
       34
        
       

     

       51
       35
        
         makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ];

+12 -8

pkgs/os-specific/bsd/freebsd/pkgs/install.nix

···

       4
       4
        
         mkDerivation,

     

       5
       5
        
         writeShellScript,

     

       6
       6
        
         freebsd-lib,

     

       7
       7
       -
         mtree,

     

       8
       7
        
         bsdSetupHook,

     

       9
       8
        
         freebsdSetupHook,

     

       10
       9
        
         makeMinimal,

     
···

       30
       29
        
       in

     

       31
       30
        
       mkDerivation {

     

       32
       31
        
         path = "usr.bin/xinstall";

     

       33
       33
       -
         extraPaths = [ mtree.path ];

     

       32
       32
       +
         extraPaths = [ "contrib/mtree" ];

     

       34
       33
        
         nativeBuildInputs = [

     

       35
       34
        
           bsdSetupHook

     

       36
       35
        
           freebsdSetupHook

     
···

       44
       43
        
           libmd

     

       45
       44
        
           libnetbsd

     

       46
       45
        
         ];

     

       47
       47
       -
         makeFlags = [

     

       48
       48
       -
           "STRIP=-s" # flag to install, not command

     

       49
       49
       -
           "MK_WERROR=no"

     

       50
       50
       -
           "TESTSDIR=${builtins.placeholder "test"}"

     

       51
       51
       -
         ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install";

     

       46
       46
       +
         makeFlags =

     

       47
       47
       +
           [

     

       48
       48
       +
             "STRIP=-s" # flag to install, not command

     

       49
       49
       +
             "MK_WERROR=no"

     

       50
       50
       +
             "TESTSDIR=${builtins.placeholder "test"}"

     

       51
       51
       +
           ]

     

       52
       52
       +
           ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [

     

       53
       53
       +
             "BOOTSTRAPPING=1"

     

       54
       54
       +
             "INSTALL=boot-install"

     

       55
       55
       +
           ];

     

       52
       56
        
         postInstall = ''

     

       53
       53
       -
           install -D -m 0550 ${binstall} $out/bin/binstall

     

       57
       57
       +
           install -C -m 0550 ${binstall} $out/bin/binstall

     

       54
       58
        
           substituteInPlace $out/bin/binstall --subst-var out

     

       55
       59
        
           mv $out/bin/install $out/bin/xinstall

     

       56
       60
        
           ln -s ./binstall $out/bin/install

+200 -72

pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         buildPackages,

     

       3
       4
        
         stdenv,

     

       4
       5
        
         mkDerivation,

     

       5
       5
       -
         patchesRoot,

     

       6
       6
        
       

     

       7
       7
        
         bsdSetupHook,

     

       8
       8
        
         freebsdSetupHook,

     
···

       12
       12
        
         byacc,

     

       13
       13
        
         gencat,

     

       14
       14
        
         rpcgen,

     

       15
       15
       +
         mkcsmapper,

     

       16
       16
       +
         mkesdb,

     

       15
       17
        
       

     

       16
       18
        
         csu,

     

       17
       19
        
         include,

     

       20
       20
       +
         versionData,

     

       18
       21
        
       }:

     

       19
       22
        
       

     

       20
       20
       -
       mkDerivation rec {

     

       23
       23
       +
       mkDerivation {

     

       24
       24
       +
         isStatic = true;

     

       21
       25
        
         pname = "libc";

     

       22
       26
        
         path = "lib/libc";

     

       23
       23
       -
         extraPaths = [

     

       24
       24
       -
           "etc/group"

     

       25
       25
       -
           "etc/master.passwd"

     

       26
       26
       -
           "etc/shells"

     

       27
       27
       -
           "lib/libmd"

     

       28
       28
       -
           "lib/libutil"

     

       29
       29
       -
           "lib/msun"

     

       30
       30
       -
           "sys/kern"

     

       31
       31
       -
           "sys/libkern"

     

       32
       32
       -
           "sys/sys"

     

       33
       33
       -
           "sys/crypto/chacha20"

     

       34
       34
       -
           "include/rpcsvc"

     

       35
       35
       -
           "contrib/jemalloc"

     

       36
       36
       -
           "contrib/gdtoa"

     

       37
       37
       -
           "contrib/libc-pwcache"

     

       38
       38
       -
           "contrib/libc-vis"

     

       39
       39
       -
           "contrib/tzcode/stdtime"

     

       27
       27
       +
         extraPaths =

     

       28
       28
       +
           [

     

       29
       29
       +
             "lib/libc_nonshared"

     

       30
       30
       +
             "etc/group"

     

       31
       31
       +
             "etc/master.passwd"

     

       32
       32
       +
             "etc/shells"

     

       33
       33
       +
             "lib/libmd"

     

       34
       34
       +
             "lib/libutil"

     

       35
       35
       +
             "lib/msun"

     

       36
       36
       +
             "sys/kern"

     

       37
       37
       +
             "sys/libkern"

     

       38
       38
       +
             "sys/sys"

     

       39
       39
       +
             "sys/crypto/chacha20"

     

       40
       40
       +
             "include/rpcsvc"

     

       41
       41
       +
             "contrib/jemalloc"

     

       42
       42
       +
             "contrib/gdtoa"

     

       43
       43
       +
             "contrib/libc-pwcache"

     

       44
       44
       +
             "contrib/libc-vis"

     

       45
       45
       +
             "contrib/tzcode/stdtime"

     

       40
       46
        
       

     

       41
       41
       -
           # libthr

     

       42
       42
       -
           "lib/libthr"

     

       43
       43
       -
           "lib/libthread_db"

     

       44
       44
       -
           "libexec/rtld-elf"

     

       47
       47
       +
             # libthr

     

       48
       48
       +
             "lib/libthr"

     

       49
       49
       +
             "lib/libthread_db"

     

       50
       50
       +
             "libexec/rtld-elf"

     

       51
       51
       +
             "lib/csu/common/crtbrand.S"

     

       52
       52
       +
             "lib/csu/common/notes.h"

     

       45
       53
        
       

     

       46
       46
       -
           # librpcsvc

     

       47
       47
       -
           "lib/librpcsvc"

     

       54
       54
       +
             # librpcsvc

     

       55
       55
       +
             "lib/librpcsvc"

     

       48
       56
        
       

     

       49
       49
       -
           # librt

     

       50
       50
       -
           "lib/librt"

     

       57
       57
       +
             # librt

     

       58
       58
       +
             "lib/librt"

     

       51
       59
        
       

     

       52
       52
       -
           # libcrypt

     

       53
       53
       -
           "lib/libcrypt"

     

       54
       54
       -
           "lib/libmd"

     

       55
       55
       -
           "sys/crypto/sha2"

     

       56
       56
       -
         ];

     

       60
       60
       +
             # libcrypt

     

       61
       61
       +
             "lib/libcrypt"

     

       62
       62
       +
             "lib/libmd"

     

       63
       63
       +
             "sys/crypto/sha2"

     

       64
       64
       +
             "sys/crypto/skein"

     

       57
       65
        
       

     

       58
       58
       -
         patches = [

     

       59
       59
       -
           # Hack around broken propogating MAKEFLAGS to submake, just inline logic

     

       60
       60
       -
           /${patchesRoot}/libc-msun-arch-subdir.patch

     

       66
       66
       +
             # libgcc and friends

     

       67
       67
       +
             "lib/libgcc_eh"

     

       68
       68
       +
             "lib/libgcc_s"

     

       69
       69
       +
             "lib/libcompiler_rt"

     

       70
       70
       +
             "contrib/llvm-project/libunwind"

     

       71
       71
       +
             "contrib/llvm-project/compiler-rt"

     

       72
       72
       +
             #"contrib/llvm-project/libcxx"

     

       61
       73
        
       

     

       62
       62
       -
           # Don't force -lcompiler-rt, we don't actually call it that

     

       63
       63
       -
           /${patchesRoot}/libc-no-force--lcompiler-rt.patch

     

       74
       74
       +
             # terminfo

     

       75
       75
       +
             "lib/ncurses"

     

       76
       76
       +
             "contrib/ncurses"

     

       77
       77
       +
             "lib/Makefile.inc"

     

       78
       78
       +
           ]

     

       79
       79
       +
           ++ lib.optionals (stdenv.hostPlatform.isx86_32) [ "lib/libssp_nonshared" ]

     

       80
       80
       +
           ++ [

     

       81
       81
       +
             "lib/libexecinfo"

     

       82
       82
       +
             "contrib/libexecinfo"

     

       64
       83
        
       

     

       65
       65
       -
           # Fix extra include dir to get rpcsvc headers.

     

       66
       66
       -
           /${patchesRoot}/librpcsvc-include-subdir.patch

     

       67
       67
       -
         ];

     

       84
       84
       +
             "lib/libkvm"

     

       85
       85
       +
             "sys" # ummmmmmmmmm libkvm wants arch-specific headers from the kernel tree

     

       86
       86
       +
       

     

       87
       87
       +
             "lib/libmemstat"

     

       88
       88
       +
       

     

       89
       89
       +
             "lib/libprocstat"

     

       90
       90
       +
             "sys/contrib/openzfs"

     

       91
       91
       +
             "sys/contrib/pcg-c"

     

       92
       92
       +
             "sys/opencrypto"

     

       93
       93
       +
             "sys/contrib/ck"

     

       94
       94
       +
             "sys/crypto"

     

       95
       95
       +
       

     

       96
       96
       +
             "lib/libdevstat"

     

       97
       97
       +
       

     

       98
       98
       +
             "lib/libelf"

     

       99
       99
       +
             "contrib/elftoolchain"

     

       100
       100
       +
       

     

       101
       101
       +
             "lib/libiconv_modules"

     

       102
       102
       +
             "share/i18n"

     

       103
       103
       +
             "include/paths.h"

     

       104
       104
       +
       

     

       105
       105
       +
             "lib/libdl"

     

       106
       106
       +
           ];

     

       68
       107
        
       

     

       69
       108
        
         postPatch = ''

     

       70
       109
        
           substituteInPlace $COMPONENT_PATH/Makefile --replace '.include <src.opts.mk>' ""

     

       110
       110
       +
       

     

       111
       111
       +
           substituteInPlace $BSDSRCDIR/include/paths.h \

     

       112
       112
       +
               --replace '/usr/lib/i18n' '${builtins.placeholder "out"}/lib/i18n' \

     

       113
       113
       +
               --replace '/usr/share/i18n' '${builtins.placeholder "out"}/share/i18n'

     

       71
       114
        
         '';

     

       72
       115
        
       

     

       73
       116
        
         nativeBuildInputs = [

     
···

       80
       123
        
           byacc

     

       81
       124
        
           gencat

     

       82
       125
        
           rpcgen

     

       126
       126
       +
           mkcsmapper

     

       127
       127
       +
           mkesdb

     

       83
       128
        
         ];

     

       84
       129
        
         buildInputs = [

     

       85
       130
        
           include

     

       86
       131
        
           csu

     

       87
       132
        
         ];

     

       88
       88
       -
         env.NIX_CFLAGS_COMPILE = "-B${csu}/lib";

     

       89
       89
       -
       

     

       90
       90
       -
         # Suppress lld >= 16 undefined version errors

     

       91
       91
       -
         # https://github.com/freebsd/freebsd-src/commit/2ba84b4bcdd6012e8cfbf8a0d060a4438623a638

     

       92
       92
       -
         env.NIX_LDFLAGS = lib.optionalString (stdenv.targetPlatform.linker == "lld") "--undefined-version";

     

       133
       133
       +
         env.NIX_CFLAGS_COMPILE = toString [

     

       134
       134
       +
           "-B${csu}/lib"

     

       135
       135
       +
           # These are supposed to have _RTLD_COMPAT_LIB_SUFFIX so we can get things like "lib32"

     

       136
       136
       +
           # but that's unnecessary

     

       137
       137
       +
           "-DSTANDARD_LIBRARY_PATH=\"${builtins.placeholder "out"}/lib\""

     

       138
       138
       +
           "-D_PATH_RTLD=\"${builtins.placeholder "out"}/libexec/ld-elf.so.1\""

     

       139
       139
       +
         ];

     

       93
       140
        
       

     

       94
       141
        
         makeFlags = [

     

       95
       142
        
           "STRIP=-s" # flag to install, not command

     
···

       100
       147
        
         MK_SYMVER = "yes";

     

       101
       148
        
         MK_SSP = "yes";

     

       102
       149
        
         MK_NLS = "yes";

     

       103
       103
       -
         MK_ICONV = "no"; # TODO make srctop

     

       150
       150
       +
         MK_ICONV = "yes";

     

       104
       151
        
         MK_NS_CACHING = "yes";

     

       105
       152
        
         MK_INET6_SUPPORT = "yes";

     

       106
       153
        
         MK_HESIOD = "yes";

     
···

       112
       159
        
         MK_MALLOC_PRODUCTION = "yes";

     

       113
       160
        
       

     

       114
       161
        
         MK_TESTS = "no";

     

       162
       162
       +
         MACHINE_ABI = "";

     

       163
       163
       +
         MK_DETECT_TZ_CHANGES = "no";

     

       164
       164
       +
         MK_MACHDEP_OPTIMIZATIONS = "yes";

     

       165
       165
       +
         MK_ASAN = "no";

     

       166
       166
       +
         MK_UBSAN = "no";

     

       115
       167
        
       

     

       116
       116
       -
         postInstall = ''

     

       117
       117
       -
           pushd ${include}

     

       118
       118
       -
           find . -type d -exec mkdir -p $out/\{} \;

     

       119
       119
       -
           find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;

     

       120
       120
       -
           popd

     

       168
       168
       +
         NO_FSCHG = "yes";

     

       121
       169
        
       

     

       122
       122
       -
           pushd ${csu}

     

       123
       123
       -
           find . -type d -exec mkdir -p $out/\{} \;

     

       124
       124
       -
           find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;

     

       125
       125
       -
           popd

     

       170
       170
       +
         preBuild = lib.optionalString (stdenv.hostPlatform.isx86_32) ''

     

       171
       171
       +
           make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags

     

       172
       172
       +
           make -C $BSDSRCDIR/lib/libssp_nonshared $makeFlags install

     

       173
       173
       +
         '';

     

       126
       174
        
       

     

       127
       127
       -
           sed -i -e 's| [^ ]*/libc_nonshared.a||' $out/lib/libc.so

     

       175
       175
       +
         postInstall =

     

       176
       176
       +
           ''

     

       177
       177
       +
             pushd ${include}

     

       178
       178
       +
             find . -type d -exec mkdir -p $out/\{} \;

     

       179
       179
       +
             find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;

     

       180
       180
       +
             popd

     

       128
       181
        
       

     

       129
       129
       -
           $CC -nodefaultlibs -lgcc -shared -o $out/lib/libgcc_s.so

     

       182
       182
       +
             pushd ${csu}

     

       183
       183
       +
             find . -type d -exec mkdir -p $out/\{} \;

     

       184
       184
       +
             find . \( -type f -o -type l \) -exec cp -pr \{} $out/\{} \;

     

       185
       185
       +
             popd

     

       130
       186
        
       

     

       131
       131
       -
           NIX_CFLAGS_COMPILE+=" -B$out/lib"

     

       132
       132
       -
           NIX_CFLAGS_COMPILE+=" -I$out/include"

     

       133
       133
       -
           NIX_LDFLAGS+=" -L$out/lib"

     

       187
       187
       +
             mkdir $BSDSRCDIR/lib/libcompiler_rt/i386

     

       188
       188
       +
             make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags

     

       189
       189
       +
             make -C $BSDSRCDIR/lib/libcompiler_rt $makeFlags install

     

       134
       190
        
       

     

       135
       135
       -
           make -C $BSDSRCDIR/lib/libthr $makeFlags

     

       136
       136
       -
           make -C $BSDSRCDIR/lib/libthr $makeFlags install

     

       191
       191
       +
             make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags

     

       192
       192
       +
             make -C $BSDSRCDIR/lib/libgcc_eh $makeFlags install

     

       137
       193
        
       

     

       138
       138
       -
           make -C $BSDSRCDIR/lib/msun $makeFlags

     

       139
       139
       -
           make -C $BSDSRCDIR/lib/msun $makeFlags install

     

       194
       194
       +
             ln -s $BSDSRCDIR/lib/libc/libc.so.7 $BSDSRCDIR/lib/libc/libc.so  # not sure

     

       195
       195
       +
             mkdir $BSDSRCDIR/lib/libgcc_s/i386

     

       196
       196
       +
             make -C $BSDSRCDIR/lib/libgcc_s $makeFlags

     

       197
       197
       +
             make -C $BSDSRCDIR/lib/libgcc_s $makeFlags install

     

       140
       198
        
       

     

       141
       141
       -
           make -C $BSDSRCDIR/lib/librpcsvc $makeFlags

     

       142
       142
       -
           make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install

     

       199
       199
       +
             NIX_CFLAGS_COMPILE+=" -B$out/lib"

     

       200
       200
       +
             NIX_CFLAGS_COMPILE+=" -I$out/include"

     

       201
       201
       +
             NIX_LDFLAGS+=" -L$out/lib"

     

       143
       202
        
       

     

       144
       144
       -
           make -C $BSDSRCDIR/lib/libutil $makeFlags

     

       145
       145
       -
           make -C $BSDSRCDIR/lib/libutil $makeFlags install

     

       203
       203
       +
             make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags

     

       204
       204
       +
             make -C $BSDSRCDIR/lib/libc_nonshared $makeFlags install

     

       146
       205
        
       

     

       147
       147
       -
           make -C $BSDSRCDIR/lib/librt $makeFlags

     

       148
       148
       -
           make -C $BSDSRCDIR/lib/librt $makeFlags install

     

       206
       206
       +
             mkdir $BSDSRCDIR/lib/libmd/sys

     

       207
       207
       +
             make -C $BSDSRCDIR/lib/libmd $makeFlags

     

       208
       208
       +
             make -C $BSDSRCDIR/lib/libmd $makeFlags install

     

       149
       209
        
       

     

       150
       150
       -
           make -C $BSDSRCDIR/lib/libcrypt $makeFlags

     

       151
       151
       -
           make -C $BSDSRCDIR/lib/libcrypt $makeFlags install

     

       210
       210
       +
             make -C $BSDSRCDIR/lib/libthr $makeFlags

     

       211
       211
       +
             make -C $BSDSRCDIR/lib/libthr $makeFlags install

     

       212
       212
       +
       

     

       213
       213
       +
             make -C $BSDSRCDIR/lib/msun $makeFlags

     

       214
       214
       +
             make -C $BSDSRCDIR/lib/msun $makeFlags install

     

       215
       215
       +
       

     

       216
       216
       +
             make -C $BSDSRCDIR/lib/librpcsvc $makeFlags

     

       217
       217
       +
             make -C $BSDSRCDIR/lib/librpcsvc $makeFlags install

     

       218
       218
       +
       

     

       219
       219
       +
             make -C $BSDSRCDIR/lib/libutil $makeFlags

     

       220
       220
       +
             make -C $BSDSRCDIR/lib/libutil $makeFlags install

     

       221
       221
       +
       

     

       222
       222
       +
             make -C $BSDSRCDIR/lib/librt $makeFlags

     

       223
       223
       +
             make -C $BSDSRCDIR/lib/librt $makeFlags install

     

       224
       224
       +
       

     

       225
       225
       +
             make -C $BSDSRCDIR/lib/libcrypt $makeFlags

     

       226
       226
       +
             make -C $BSDSRCDIR/lib/libcrypt $makeFlags install

     

       227
       227
       +
       

     

       228
       228
       +
             make -C $BSDSRCDIR/lib/libelf $makeFlags

     

       229
       229
       +
             make -C $BSDSRCDIR/lib/libelf $makeFlags install

     

       230
       230
       +
       

     

       231
       231
       +
             make -C $BSDSRCDIR/lib/libexecinfo $makeFlags

     

       232
       232
       +
             make -C $BSDSRCDIR/lib/libexecinfo $makeFlags install

     

       233
       233
       +
       

     

       234
       234
       +
             make -C $BSDSRCDIR/lib/libkvm $makeFlags

     

       235
       235
       +
             make -C $BSDSRCDIR/lib/libkvm $makeFlags install

     

       236
       236
       +
       

     

       237
       237
       +
             make -C $BSDSRCDIR/lib/libmemstat $makeFlags

     

       238
       238
       +
             make -C $BSDSRCDIR/lib/libmemstat $makeFlags install

     

       239
       239
       +
       

     

       240
       240
       +
             make -C $BSDSRCDIR/lib/libprocstat $makeFlags

     

       241
       241
       +
             make -C $BSDSRCDIR/lib/libprocstat $makeFlags install

     

       242
       242
       +
       

     

       243
       243
       +
             make -C $BSDSRCDIR/lib/libdevstat $makeFlags

     

       244
       244
       +
             make -C $BSDSRCDIR/lib/libdevstat $makeFlags install

     

       245
       245
       +
       

     

       246
       246
       +
             make -C $BSDSRCDIR/lib/libiconv_modules $makeFlags

     

       247
       247
       +
             make -C $BSDSRCDIR/lib/libiconv_modules $makeFlags SHLIBDIR=${builtins.placeholder "out"}/lib/i18n install

     

       248
       248
       +
       

     

       249
       249
       +
             make -C $BSDSRCDIR/lib/libdl $makeFlags

     

       250
       250
       +
             make -C $BSDSRCDIR/lib/libdl $makeFlags install

     

       251
       251
       +
       

     

       252
       252
       +
             make -C $BSDSRCDIR/share/i18n $makeFlags

     

       253
       253
       +
             make -C $BSDSRCDIR/share/i18n $makeFlags ESDBDIR=${builtins.placeholder "out"}/share/i18n/esdb CSMAPPERDIR=${builtins.placeholder "out"}/share/i18n/csmapper install

     

       254
       254
       +
       

     

       255
       255
       +
           ''

     

       256
       256
       +
           + lib.optionalString stdenv.hostPlatform.isx86_32 ''

     

       257
       257
       +
             $CC -c $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.c -o $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.o

     

       258
       258
       +
             ORIG_NIX_LDFLAGS="$NIX_LDFLAGS"

     

       259
       259
       +
             NIX_LDFLAGS+=" $BSDSRCDIR/contrib/llvm-project/compiler-rt/lib/builtins/udivdi3.o"

     

       260
       260
       +
           ''

     

       261
       261
       +
           + ''

     

       262
       262
       +
             make -C $BSDSRCDIR/libexec/rtld-elf $makeFlags

     

       263
       263
       +
             make -C $BSDSRCDIR/libexec/rtld-elf $makeFlags install

     

       264
       264
       +
             rm -f $out/libexec/ld-elf.so.1

     

       265
       265
       +
             mv $out/bin/ld-elf.so.1 $out/libexec

     

       266
       266
       +
           '';

     

       267
       267
       +
       

     

       268
       268
       +
         # libc should not be allowed to refer to anything other than itself

     

       269
       269
       +
         postFixup = ''

     

       270
       270
       +
           find $out -type f | xargs -n1 ${buildPackages.patchelf}/bin/patchelf --shrink-rpath --allowed-rpath-prefixes $out || true

     

       152
       271
        
         '';

     

       153
       272
        
       

     

       154
       273
        
         meta.platforms = lib.platforms.freebsd;

     

       274
       274
       +
       

     

       275
       275
       +
         # definitely a bad idea to enable stack protection on the stack protection initializers

     

       276
       276
       +
         hardeningDisable = [ "stackprotector" ];

     

       277
       277
       +
       

     

       278
       278
       +
         outputs = [

     

       279
       279
       +
           "out"

     

       280
       280
       +
           "man"

     

       281
       281
       +
           "debug"

     

       282
       282
       +
         ];

     

       155
       283
        
       }

+3 -20

pkgs/os-specific/bsd/freebsd/pkgs/libdwarf.nix

···

       1
       1
        
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       2
        
         mkDerivation,

     

       5
       5
       -
         bsdSetupHook,

     

       6
       6
       -
         freebsdSetupHook,

     

       7
       7
       -
         makeMinimal,

     

       8
       8
       -
         install,

     

       9
       9
       -
         mandoc,

     

       10
       10
       -
         groff,

     

       11
       3
        
         m4,

     

       12
       4
        
         compatIfNeeded,

     

       13
       13
       -
         libelf,

     

       5
       5
       +
         zlib,

     

       14
       6
        
       }:

     

       15
       7
        
       

     

       16
       8
        
       mkDerivation {

     
···

       22
       14
        
           "sys/sys/elf64.h"

     

       23
       15
        
           "sys/sys/elf_common.h"

     

       24
       16
        
         ];

     

       25
       25
       -
         nativeBuildInputs = [

     

       26
       26
       -
           bsdSetupHook

     

       27
       27
       -
           freebsdSetupHook

     

       28
       28
       -
           makeMinimal

     

       29
       29
       -
           install

     

       30
       30
       -
           mandoc

     

       31
       31
       -
           groff

     

       32
       32
       -
       

     

       33
       33
       -
           m4

     

       34
       34
       -
         ];

     

       35
       35
       -
         buildInputs = compatIfNeeded ++ [ libelf ];

     

       17
       17
       +
         extraNativeBuildInputs = [ m4 ];

     

       18
       18
       +
         buildInputs = compatIfNeeded ++ [ zlib ];

     

       36
       19
        
         MK_TESTS = "no";

     

       37
       20
        
       }

-35

pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         mkDerivation,

     

       5
       5
       -
         bsdSetupHook,

     

       6
       6
       -
         freebsdSetupHook,

     

       7
       7
       -
         makeMinimal,

     

       8
       8
       -
         install,

     

       9
       9
       -
         mandoc,

     

       10
       10
       -
         groff,

     

       11
       11
       -
         m4,

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       mkDerivation {

     

       15
       15
       -
         path = "lib/libelf";

     

       16
       16
       -
         extraPaths = [

     

       17
       17
       -
           "contrib/elftoolchain/libelf"

     

       18
       18
       -
           "contrib/elftoolchain/common"

     

       19
       19
       -
           "sys/sys/elf32.h"

     

       20
       20
       -
           "sys/sys/elf64.h"

     

       21
       21
       -
           "sys/sys/elf_common.h"

     

       22
       22
       -
         ];

     

       23
       23
       -
         BOOTSTRAPPING = !stdenv.isFreeBSD;

     

       24
       24
       -
         nativeBuildInputs = [

     

       25
       25
       -
           bsdSetupHook

     

       26
       26
       -
           freebsdSetupHook

     

       27
       27
       -
           makeMinimal

     

       28
       28
       -
           install

     

       29
       29
       -
           mandoc

     

       30
       30
       -
           groff

     

       31
       31
       -
       

     

       32
       32
       -
           m4

     

       33
       33
       -
         ];

     

       34
       34
       -
         MK_TESTS = "no";

     

       35
       35
       -
       }

+49

pkgs/os-specific/bsd/freebsd/pkgs/libmd.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         mkDerivation,

     

       5
       5
       +
         freebsdSetupHook,

     

       6
       6
       +
         bsdSetupHook,

     

       7
       7
       +
         makeMinimal,

     

       8
       8
       +
       }:

     

       9
       9
       +
       mkDerivation {

     

       10
       10
       +
         path = "lib/libmd";

     

       11
       11
       +
         extraPaths = [

     

       12
       12
       +
           "sys/sys/md5.h"

     

       13
       13
       +
           "sys/crypto/sha2"

     

       14
       14
       +
           "sys/crypto/skein"

     

       15
       15
       +
         ];

     

       16
       16
       +
         nativeBuildInputs = [

     

       17
       17
       +
           makeMinimal

     

       18
       18
       +
           bsdSetupHook

     

       19
       19
       +
           freebsdSetupHook

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       22
       22
       +
         makeFlags = [

     

       23
       23
       +
           "STRIP=-s" # flag to install, not command

     

       24
       24
       +
           "RELDIR=."

     

       25
       25
       +
         ] ++ lib.optional (!stdenv.hostPlatform.isFreeBSD) "MK_WERROR=no";

     

       26
       26
       +
       

     

       27
       27
       +
         preBuild = ''

     

       28
       28
       +
           mkdir sys

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         installPhase = ''

     

       32
       32
       +
           # libmd is used by install. do it yourself!

     

       33
       33
       +
           mkdir -p $out/include $out/lib $man/share/man

     

       34
       34
       +
           cp libmd.a $out/lib/libmd.a

     

       35
       35
       +
           for f in $(make $makeFlags -V INCS); do

     

       36
       36
       +
             if [ -e "$f" ]; then cp "$f" "$out/include/$f"; fi

     

       37
       37
       +
             if [ -e "$BSDSRCDIR/sys/crypto/sha2/$f" ]; then cp "$BSDSRCDIR/sys/crypto/sha2/$f" "$out/include/$f"; fi

     

       38
       38
       +
             if [ -e "$BSDSRCDIR/sys/crypto/skein/$f" ]; then cp "$BSDSRCDIR/sys/crypto/skein/$f" "$out/include/$f"; fi

     

       39
       39
       +
           done

     

       40
       40
       +
           for f in $(make $makeFlags -V MAN); do

     

       41
       41
       +
             cp "$f" "$man/share/man/$f"

     

       42
       42
       +
           done

     

       43
       43
       +
         '';

     

       44
       44
       +
       

     

       45
       45
       +
         outputs = [

     

       46
       46
       +
           "out"

     

       47
       47
       +
           "man"

     

       48
       48
       +
         ];

     

       49
       49
       +
       }

-7

pkgs/os-specific/bsd/freebsd/pkgs/libnetbsd/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         mkDerivation,

     

       5
       5
       -
         patchesRoot,

     

       6
       5
        
         bsdSetupHook,

     

       7
       6
        
         freebsdSetupHook,

     

       8
       7
        
         makeMinimal,

     
···

       10
       9
        
         groff,

     

       11
       10
        
         boot-install,

     

       12
       11
        
         install,

     

       13
       13
       -
         compatIfNeeded,

     

       14
       12
        
       }:

     

       15
       13
        
       

     

       16
       14
        
       mkDerivation {

     
···

       23
       21
        
           groff

     

       24
       22
        
           (if stdenv.hostPlatform == stdenv.buildPlatform then boot-install else install)

     

       25
       23
        
         ];

     

       26
       26
       -
         patches = lib.optionals (!stdenv.hostPlatform.isFreeBSD) [

     

       27
       27
       -
           /${patchesRoot}/libnetbsd-do-install.patch

     

       28
       28
       -
           #/${patchesRoot}/libnetbsd-define-__va_list.patch

     

       29
       29
       -
         ];

     

       30
       24
        
         makeFlags = [

     

       31
       25
        
           "STRIP=-s" # flag to install, not command

     

       32
       26
        
           "MK_WERROR=no"

     

       33
       27
        
         ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "INSTALL=boot-install";

     

       34
       34
       -
         buildInputs = compatIfNeeded;

     

       35
       28
        
       }

+12 -11

pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix

···

       3
       3
        
       mkDerivation {

     

       4
       4
        
         path = "cddl/lib/libspl";

     

       5
       5
        
         extraPaths = [

     

       6
       6
       -
           "sys/contrib/openzfs/lib/libspl"

     

       7
       7
       -
           "sys/contrib/openzfs/include"

     

       8
       8
       -
       

     

       9
       6
        
           "cddl/compat/opensolaris/include"

     

       7
       7
       +
           "sys/contrib/openzfs/include"

     

       8
       8
       +
           "sys/contrib/openzfs/lib/libspl"

     

       10
       9
        
           "sys/contrib/openzfs/module/icp/include"

     

       11
       11
       -
           "sys/modules/zfs"

     

       10
       10
       +
           "sys/modules/zfs/zfs_config.h"

     

       12
       11
        
         ];

     

       13
       13
       -
         # nativeBuildInputs = [

     

       14
       14
       -
         #   bsdSetupHook freebsdSetupHook

     

       15
       15
       -
         #   makeMinimal install mandoc groff

     

       12
       12
       +
       

     

       13
       13
       +
         # Without a prefix it will try to put object files in nonexistant directories

     

       14
       14
       +
         preBuild = ''

     

       15
       15
       +
           export MAKEOBJDIRPREFIX=$TMP/obj

     

       16
       16
       +
         '';

     

       16
       17
        
       

     

       17
       17
       -
         #   flex byacc file2c

     

       18
       18
       -
         # ];

     

       19
       19
       -
         # buildInputs = compatIfNeeded ++ [ libnv libsbuf ];

     

       20
       20
       -
         meta.license = lib.licenses.cddl;

     

       18
       18
       +
         meta = with lib; {

     

       19
       19
       +
           platform = platforms.freebsd;

     

       20
       20
       +
           license = licenses.cddl;

     

       21
       21
       +
         };

     

       21
       22
        
       }

-1

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

···

       6
       6
        
       mkDerivation {

     

       7
       7
        
         path = "lib/libutil";

     

       8
       8
        
         extraPaths = [ "lib/libc/gen" ];

     

       9
       9
       -
         clangFixup = true;

     

       10
       9
        
         MK_TESTS = "no";

     

       11
       10
        
       }

+1 -2

pkgs/os-specific/bsd/freebsd/pkgs/lorder.nix

···

       3
       3
        
         bsdSetupHook,

     

       4
       4
        
         freebsdSetupHook,

     

       5
       5
        
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       mkDerivation rec {

     

       6
       6
       +
       mkDerivation {

     

       8
       7
        
         path = "usr.bin/lorder";

     

       9
       8
        
         noCC = true;

     

       10
       9
        
         dontBuild = true;

+3 -1

pkgs/os-specific/bsd/freebsd/pkgs/makeMinimal.nix

···

       7
       7
        
         freebsdSetupHook,

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
       -
       mkDerivation rec {

     

       10
       10
       +
       mkDerivation {

     

       11
       11
        
         inherit (make) path;

     

       12
       12
        
       

     

       13
       13
        
         buildInputs = [ ];

     
···

       24
       24
        
           patchShebangs configure

     

       25
       25
        
           ${make.postPatch}

     

       26
       26
        
         '';

     

       27
       27
       +
       

     

       28
       28
       +
         configureFlags = [ "--with-filemon=no" ];

     

       27
       29
        
       

     

       28
       30
        
         buildPhase = ''

     

       29
       31
        
           runHook preBuild

+87 -24

pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         stdenvNoCC,

     

       5
       5
       +
         versionData,

     

       6
       6
       +
         writeText,

     

       7
       7
       +
         patches,

     

       5
       8
        
         compatIfNeeded,

     

       6
       6
       -
         runCommand,

     

       7
       7
       -
         rsync,

     

       8
       9
        
         freebsd-lib,

     

       9
       9
       -
         source,

     

       10
       10
       +
         filterSource,

     

       10
       11
        
         bsdSetupHook,

     

       11
       12
        
         freebsdSetupHook,

     

       12
       13
        
         makeMinimal,

     
···

       24
       25
        
         in

     

       25
       26
        
         stdenv'.mkDerivation (

     

       26
       27
        
           rec {

     

       27
       27
       -
             pname = "${attrs.pname or (baseNameOf attrs.path)}-freebsd";

     

       28
       28
        
             inherit (freebsd-lib) version;

     

       29
       29
       -
             src = runCommand "${pname}-filtered-src" { nativeBuildInputs = [ rsync ]; } ''

     

       30
       30
       -
               for p in ${lib.concatStringsSep " " ([ attrs.path ] ++ attrs.extraPaths or [ ])}; do

     

       31
       31
       -
                 set -x

     

       32
       32
       -
                 path="$out/$p"

     

       33
       33
       -
                 mkdir -p "$(dirname "$path")"

     

       34
       34
       -
                 src_path="${source}/$p"

     

       35
       35
       -
                 if [[ -d "$src_path" ]]; then src_path+=/; fi

     

       36
       36
       -
                 rsync --chmod="+w" -r "$src_path" "$path"

     

       37
       37
       -
                 set +x

     

       38
       38
       -
               done

     

       39
       39
       -
             '';

     

       40
       40
       -
       

     

       41
       41
       -
             extraPaths = [ ];

     

       29
       29
       +
             pname = "${attrs.pname or (baseNameOf attrs.path)}";

     

       30
       30
       +
             src = filterSource {

     

       31
       31
       +
               inherit pname;

     

       32
       32
       +
               inherit (attrs) path;

     

       33
       33
       +
               extraPaths = attrs.extraPaths or [ ];

     

       34
       34
       +
             };

     

       42
       35
        
       

     

       43
       36
        
             nativeBuildInputs = [

     

       44
       37
        
               bsdSetupHook

     
···

       48
       41
        
               tsort

     

       49
       42
        
               lorder

     

       50
       43
        
               mandoc

     

       51
       51
       -
               groff # statHook

     

       52
       52
       -
             ];

     

       44
       44
       +
               groff

     

       45
       45
       +
             ] ++ attrs.extraNativeBuildInputs or [ ];

     

       53
       46
        
             buildInputs = compatIfNeeded;

     

       54
       47
        
       

     

       55
       48
        
             HOST_SH = stdenv'.shell;

     
···

       72
       65
        
       

     

       73
       66
        
             strictDeps = true;

     

       74
       67
        
       

     

       75
       75
       -
             meta = with lib; {

     

       76
       76
       -
               maintainers = with maintainers; [ ericson2314 ];

     

       77
       77
       -
               platforms = platforms.unix;

     

       78
       78
       -
               license = licenses.bsd2;

     

       79
       79
       -
             };

     

       68
       68
       +
             meta =

     

       69
       69
       +
               with lib;

     

       70
       70
       +
               {

     

       71
       71
       +
                 maintainers = with maintainers; [

     

       72
       72
       +
                   rhelmot

     

       73
       73
       +
                   artemist

     

       74
       74
       +
                 ];

     

       75
       75
       +
                 platforms = platforms.unix;

     

       76
       76
       +
                 license = licenses.bsd2;

     

       77
       77
       +
               }

     

       78
       78
       +
               // attrs.meta or { };

     

       80
       79
        
           }

     

       81
       80
        
           // lib.optionalAttrs stdenv'.hasCC {

     

       82
       81
        
             # TODO should CC wrapper set this?

     
···

       95
       94
        
             dontBuild = true;

     

       96
       95
        
           }

     

       97
       96
        
           // attrs

     

       97
       97
       +
           // lib.optionalAttrs (stdenv'.hasCC && stdenv'.cc.isClang or false && attrs.clangFixup or true) {

     

       98
       98
       +
             preBuild =

     

       99
       99
       +
               ''

     

       100
       100
       +
                 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -D_VA_LIST -D_VA_LIST_DECLARED -Dva_list=__builtin_va_list -D_SIZE_T_DECLARED -D_SIZE_T -Dsize_t=__SIZE_TYPE__ -D_WCHAR_T"

     

       101
       101
       +
                 export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"

     

       102
       102
       +
               ''

     

       103
       103
       +
               + (attrs.preBuild or "");

     

       104
       104
       +
           }

     

       105
       105
       +
           // {

     

       106
       106
       +
             patches =

     

       107
       107
       +
               let

     

       108
       108
       +
                 isDir =

     

       109
       109
       +
                   file:

     

       110
       110
       +
                   let

     

       111
       111
       +
                     base = baseNameOf file;

     

       112
       112
       +
                     type = (builtins.readDir (dirOf file)).${base} or null;

     

       113
       113
       +
                   in

     

       114
       114
       +
                   file == /. || type == "directory";

     

       115
       115
       +
                 consolidatePatches =

     

       116
       116
       +
                   patches:

     

       117
       117
       +
                   if (lib.isDerivation patches) then

     

       118
       118
       +
                     [ patches ]

     

       119
       119
       +
                   else if (builtins.isPath patches) then

     

       120
       120
       +
                     (if (isDir patches) then (lib.filesystem.listFilesRecursive patches) else [ patches ])

     

       121
       121
       +
                   else if (builtins.isList patches) then

     

       122
       122
       +
                     (lib.flatten (builtins.map consolidatePatches patches))

     

       123
       123
       +
                   else

     

       124
       124
       +
                     throw "Bad patches - must be path or derivation or list thereof";

     

       125
       125
       +
                 consolidated = consolidatePatches patches;

     

       126
       126
       +
                 splitPatch =

     

       127
       127
       +
                   patchFile:

     

       128
       128
       +
                   let

     

       129
       129
       +
                     foldFunc =

     

       130
       130
       +
                       a: b:

     

       131
       131
       +
                       if (lib.strings.hasPrefix "--- " b) then

     

       132
       132
       +
                         (a ++ [ [ b ] ])

     

       133
       133
       +
                       else

     

       134
       134
       +
                         ((lib.lists.init a) ++ (lib.lists.singleton ((lib.lists.last a) ++ [ b ])));

     

       135
       135
       +
                     partitionedPatches' = lib.lists.foldl foldFunc [ [ ] ] (

     

       136
       136
       +
                       lib.strings.splitString "\n" (builtins.readFile patchFile)

     

       137
       137
       +
                     );

     

       138
       138
       +
                     partitionedPatches =

     

       139
       139
       +
                       if (builtins.length partitionedPatches' > 1) then

     

       140
       140
       +
                         (lib.lists.drop 1 partitionedPatches')

     

       141
       141
       +
                       else

     

       142
       142
       +
                         (throw "${patchFile} does not seem to be a unified patch (diff -u). this is required for FreeBSD.");

     

       143
       143
       +
                     filterFunc =

     

       144
       144
       +
                       patchLines:

     

       145
       145
       +
                       let

     

       146
       146
       +
                         prefixedPath = builtins.elemAt (builtins.split " |\t" (builtins.elemAt patchLines 1)) 2;

     

       147
       147
       +
                         unfixedPath = lib.path.subpath.join (lib.lists.drop 1 (lib.path.subpath.components prefixedPath));

     

       148
       148
       +
                       in

     

       149
       149
       +
                       lib.lists.any (included: lib.path.hasPrefix (/. + ("/" + included)) (/. + ("/" + unfixedPath))) (

     

       150
       150
       +
                         (attrs.extraPaths or [ ]) ++ [ attrs.path ]

     

       151
       151
       +
                       );

     

       152
       152
       +
                     filteredLines = builtins.filter filterFunc partitionedPatches;

     

       153
       153
       +
                     derive = patchLines: writeText "freebsd-patch" (lib.concatLines patchLines);

     

       154
       154
       +
                     derivedPatches = builtins.map derive filteredLines;

     

       155
       155
       +
                   in

     

       156
       156
       +
                   derivedPatches;

     

       157
       157
       +
                 picked = lib.lists.concatMap splitPatch consolidated;

     

       158
       158
       +
               in

     

       159
       159
       +
               picked ++ attrs.patches or [ ];

     

       160
       160
       +
           }

     

       98
       161
        
         )

     

       99
       162
        
       )

+22

pkgs/os-specific/bsd/freebsd/pkgs/mkcsmapper.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         byacc,

     

       5
       5
       +
         flex,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         path = "usr.bin/mkcsmapper";

     

       10
       10
       +
       

     

       11
       11
       +
         extraPaths = [

     

       12
       12
       +
           "lib/libc/iconv"

     

       13
       13
       +
           "lib/libiconv_modules/mapper_std"

     

       14
       14
       +
         ];

     

       15
       15
       +
       

     

       16
       16
       +
         BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;

     

       17
       17
       +
       

     

       18
       18
       +
         extraNativeBuildInputs = [

     

       19
       19
       +
           byacc

     

       20
       20
       +
           flex

     

       21
       21
       +
         ];

     

       22
       22
       +
       }

+19

pkgs/os-specific/bsd/freebsd/pkgs/mkesdb.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         mkDerivation,

     

       4
       4
       +
         byacc,

     

       5
       5
       +
         flex,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       mkDerivation {

     

       9
       9
       +
         path = "usr.bin/mkesdb";

     

       10
       10
       +
       

     

       11
       11
       +
         extraPaths = [ "lib/libc/iconv" ];

     

       12
       12
       +
       

     

       13
       13
       +
         BOOTSTRAPPING = !stdenv.hostPlatform.isFreeBSD;

     

       14
       14
       +
       

     

       15
       15
       +
         extraNativeBuildInputs = [

     

       16
       16
       +
           byacc

     

       17
       17
       +
           flex

     

       18
       18
       +
         ];

     

       19
       19
       +
       }

+35 -2

pkgs/os-specific/bsd/freebsd/pkgs/mtree.nix

···

       1
       1
       -
       { mkDerivation, mknod }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         mkDerivation,

     

       5
       5
       +
         compatIfNeeded,

     

       6
       6
       +
         compatIsNeeded,

     

       7
       7
       +
         libmd,

     

       8
       8
       +
         libnetbsd,

     

       9
       9
       +
         libutil,

     

       10
       10
       +
       }:

     

       2
       11
        
       

     

       3
       12
        
       mkDerivation {

     

       4
       13
        
         path = "contrib/mtree";

     

       5
       5
       -
         extraPaths = [ mknod.path ];

     

       14
       14
       +
         extraPaths = [ "contrib/mknod" ];

     

       15
       15
       +
         buildInputs =

     

       16
       16
       +
           compatIfNeeded

     

       17
       17
       +
           ++ [

     

       18
       18
       +
             libmd

     

       19
       19
       +
             libnetbsd

     

       20
       20
       +
           ]

     

       21
       21
       +
           ++ lib.optional (stdenv.isFreeBSD) libutil;

     

       22
       22
       +
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           ln -s $BSDSRCDIR/contrib/mknod/*.c $BSDSRCDIR/contrib/mknod/*.h $BSDSRCDIR/contrib/mtree

     

       25
       25
       +
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         preBuild = ''

     

       28
       28
       +
           export NIX_LDFLAGS="$NIX_LDFLAGS ${

     

       29
       29
       +
             toString (

     

       30
       30
       +
               [

     

       31
       31
       +
                 "-lmd"

     

       32
       32
       +
                 "-lnetbsd"

     

       33
       33
       +
               ]

     

       34
       34
       +
               ++ lib.optional compatIsNeeded "-legacy"

     

       35
       35
       +
               ++ lib.optional stdenv.isFreeBSD "-lutil"

     

       36
       36
       +
             )

     

       37
       37
       +
           }"

     

       38
       38
       +
         '';

     

       6
       39
        
       }

+2 -2

pkgs/os-specific/bsd/freebsd/pkgs/rpcgen/package.nix

···

       5
       5
        
         patchesRoot,

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
       -
       mkDerivation rec {

     

       8
       8
       +
       mkDerivation {

     

       9
       9
        
         path = "usr.bin/rpcgen";

     

       10
       10
        
         patches = lib.optionals (stdenv.hostPlatform.libc == "glibc") [

     

       11
       11
        
           # `WUNTRACED` is defined privately `bits/waitflags.h` in glibc.

     
···

       22
       22
        
           #

     

       23
       23
        
           # This hacks around this by manually including `WUNTRACED` until

     

       24
       24
        
           # the problem is fixed properly in glibc.

     

       25
       25
       -
           /${patchesRoot}/rpcgen-glibc-hack.patch

     

       25
       25
       +
           ./rpcgen-glibc-hack.patch

     

       26
       26
        
         ];

     

       27
       27
        
       }

+1 -2

pkgs/os-specific/bsd/freebsd/pkgs/sed.nix

···

       1
       1
       -
       { mkDerivation, source }:

     

       1
       1
       +
       { mkDerivation }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation {

     

       4
       4
        
         path = "usr.bin/sed";

     

       5
       5
       -
         TESTSRC = "${source}/contrib/netbsd-tests";

     

       6
       5
        
         MK_TESTS = "no";

     

       7
       6
        
       }

-1

pkgs/os-specific/bsd/freebsd/pkgs/source.nix

···

       4
       4
        
       # If you want you could fetchgit from "https://git.FreeBSD.org/src.git" instead.

     

       5
       5
        
       # The update script still pulls directly from git.freebsd.org

     

       6
       6
        
       fetchFromGitHub {

     

       7
       7
       -
         name = "src"; # Want to rename this next rebuild

     

       8
       7
        
         owner = "freebsd";

     

       9
       8
        
         repo = "freebsd-src";

     

       10
       9
        
         inherit (sourceData) rev hash;

+1 -8

pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix

···

       2
       2
        
         stdenv,

     

       3
       3
        
         mkDerivation,

     

       4
       4
        
         freebsd-lib,

     

       5
       5
       -
         patchesRoot,

     

       6
       5
        
         buildPackages,

     

       7
       6
        
         bsdSetupHook,

     

       8
       7
        
         freebsdSetupHook,

     
···

       15
       14
        
         file2c,

     

       16
       15
        
         gawk,

     

       17
       16
        
         uudecode,

     

       18
       18
       -
         xargs-j, # , ctfconvert

     

       17
       17
       +
         xargs-j,

     

       19
       18
        
       }:

     

       20
       19
        
       

     

       21
       20
        
       mkDerivation (

     
···

       39
       38
        
             gawk

     

       40
       39
        
             uudecode

     

       41
       40
        
             xargs-j

     

       42
       42
       -
             #ctfconvert

     

       43
       43
       -
           ];

     

       44
       44
       -
       

     

       45
       45
       -
           patches = [

     

       46
       46
       -
             /${patchesRoot}/sys-gnu-date.patch

     

       47
       47
       -
             /${patchesRoot}/sys-no-explicit-intrinsics-dep.patch

     

       48
       41
        
           ];

     

       49
       42
        
       

     

       50
       43
        
           # --dynamic-linker /red/herring is used when building the kernel.

+7

pkgs/os-specific/bsd/freebsd/pkgs/tsort.nix

···

       1
       1
        
       {

     

       2
       2
       +
         lib,

     

       2
       3
        
         mkDerivation,

     

       3
       4
        
         bsdSetupHook,

     

       4
       5
        
         freebsdSetupHook,

     
···

       10
       11
        
       

     

       11
       12
        
       mkDerivation {

     

       12
       13
        
         path = "usr.bin/tsort";

     

       14
       14
       +
         extraPaths = [ ];

     

       15
       15
       +
         outputs = [ "out" ];

     

       16
       16
       +
         MK_TESTS = "no";

     

       17
       17
       +
         makeFlags = [

     

       18
       18
       +
           "STRIP=-s" # flag to install, not command

     

       19
       19
       +
         ];

     

       13
       20
        
         nativeBuildInputs = [

     

       14
       21
        
           bsdSetupHook

     

       15
       22
        
           freebsdSetupHook

+1

pkgs/os-specific/bsd/netbsd/pkgs/netbsdSetupHook/setup-hook.sh

···

       9
       9
        
       

     

       10
       10
        
       addNetBSDMakeFlags() {

     

       11
       11
        
         makeFlags="INCSDIR=${!outputDev}/include $makeFlags"

     

       12
       12
       +
         makeFlags="MANDIR=${!outputMan}/share/man $makeFlags"

     

       12
       13
        
       }

     

       13
       14
        
       

     

       14
       15
        
       postUnpackHooks+=(mergeNetBSDSourceDir)

-1

pkgs/os-specific/bsd/setup-hook.sh

···

       49
       49
        
         makeFlags="LIBDIR=${!outputLib}/lib $makeFlags"

     

       50
       50
        
         makeFlags="SHLIBDIR=${!outputLib}/lib $makeFlags"

     

       51
       51
        
         makeFlags="SHAREDIR=${!outputLib}/share $makeFlags"

     

       52
       52
       -
         makeFlags="MANDIR=${!outputMan}/share/man $makeFlags"

     

       53
       52
        
         makeFlags="INFODIR=${!outputInfo}/share/info $makeFlags"

     

       54
       53
        
         makeFlags="DOCDIR=${!outputDoc}/share/doc $makeFlags"

     

       55
       54
        
         makeFlags="LOCALEDIR=${!outputLib}/share/locale $makeFlags"

+3 -3

pkgs/top-level/all-packages.nix

···

       193
       193
        
             pythonInterpreter = "${python3.withPackages (ps: [ ps.pyelftools ])}/bin/python";

     

       194
       194
        
             autoPatchelfScript = ../build-support/setup-hooks/auto-patchelf.py;

     

       195
       195
        
           };

     

       196
       196
       -
           meta.platforms = lib.platforms.linux;

     

       196
       196
       +
           meta.platforms = lib.platforms.linux ++ lib.platforms.freebsd;

     

       197
       197
        
         } ../build-support/setup-hooks/auto-patchelf.sh;

     

       198
       198
        
       

     

       199
       199
        
         tomato-c = callPackage ../applications/misc/tomato-c { };

     
···

       16343
       16343
        
           # assumption is that or any later version is good.

     

       16344
       16344
        
           choose = platform:

     

       16345
       16345
        
             /**/ if platform.isDarwin then 16

     

       16346
       16346
       -
             else if platform.isFreeBSD then 12

     

       16346
       16346
       +
             else if platform.isFreeBSD then 16

     

       16347
       16347
        
             else if platform.isAndroid then 12

     

       16348
       16348
        
             else if platform.isLinux then 17

     

       16349
       16349
        
             else if platform.isWasm then 16

     
···

       22564
       22564
        
         # We also provide `libiconvReal`, which will always be a standalone libiconv,

     

       22565
       22565
        
         # just in case you want it regardless of platform.

     

       22566
       22566
        
         libiconv =

     

       22567
       22567
       -
           if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ]

     

       22567
       22567
       +
           if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" "fblibc" ]

     

       22568
       22568
        
             then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform

     

       22569
       22569
        
               then libcCross

     

       22570
       22570
        
               else stdenv.cc.libc)

+1 -3

pkgs/top-level/stage.nix

···

       57
       57
        
       , # Non-GNU/Linux OSes are currently "impure" platforms, with their libc

     

       58
       58
        
         # outside of the store.  Thus, GCC, GFortran, & co. must always look for files

     

       59
       59
        
         # in standard system directories (/usr/include, etc.)

     

       60
       60
       -
         noSysDirs ? stdenv.buildPlatform.system != "x86_64-freebsd"

     

       61
       61
       -
                  && stdenv.buildPlatform.system != "i686-freebsd"

     

       62
       62
       -
                  && stdenv.buildPlatform.system != "x86_64-solaris"

     

       60
       60
       +
         noSysDirs ? stdenv.buildPlatform.system != "x86_64-solaris"

     

       63
       61
        
                  && stdenv.buildPlatform.system != "x86_64-kfreebsd-gnu"

     

       64
       62
        
       

     

       65
       63
        
       , # The configuration attribute set