pyrox.dev / nixpkgs
lol
fork atom

Remove obsolete useDietLibC stdenv adapter

Eelco Dolstra 5cc92eb0 937e1280

+2 -48
unified split
+1 -11
pkgs/os-specific/linux/e3cfsprogs/default.nix
··· 11 sha256 = "8dd3de546aeb1ae42fb05409aeb724a145fe9aa1dbe1115441c2297c9d48cf31"; 12 }; 13 14 - configureFlags = 15 - if stdenv ? isDietLibC 16 - then "" 17 - else "--enable-dynamic-e2fsck --enable-elf-shlibs"; 18 buildInputs = [gettext]; 19 preInstall = "installFlagsArray=('LN=ln -s')"; 20 postInstall = "make install-libs"; 21 - 22 - NIX_CFLAGS_COMPILE = 23 - if stdenv ? isDietLibC then 24 - "-UHAVE_SYS_PRCTL_H " + 25 - (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "") 26 - else ""; 27 } 28 - 29 30 #note that ext3cow requires the ext3cow kernel patch !!!!
··· 11 sha256 = "8dd3de546aeb1ae42fb05409aeb724a145fe9aa1dbe1115441c2297c9d48cf31"; 12 }; 13 14 + configureFlags ="--enable-dynamic-e2fsck --enable-elf-shlibs"; 15 buildInputs = [gettext]; 16 preInstall = "installFlagsArray=('LN=ln -s')"; 17 postInstall = "make install-libs"; 18 } 19 20 #note that ext3cow requires the ext3cow kernel patch !!!!
-4
pkgs/os-specific/linux/module-init-tools/default.nix
··· 23 24 postInstall = "rm $out/sbin/insmod.static"; # don't need it 25 26 - # We don't want bash (and therefore glibc) in the closure of the 27 - # output, since we want to put this in a initrd. 28 - dontPatchShebangs = stdenv ? isDietLibC; 29 - 30 meta = { 31 homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; 32 description = "Tools for loading and managing Linux kernel modules";
··· 23 24 postInstall = "rm $out/sbin/insmod.static"; # don't need it 25 26 meta = { 27 homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; 28 description = "Tools for loading and managing Linux kernel modules";
-30
pkgs/stdenv/adapters.nix
··· 29 overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; }; 30 31 32 - # Return a modified stdenv that uses dietlibc to create small 33 - # statically linked binaries. 34 - useDietLibC = stdenv: stdenv // 35 - { mkDerivation = args: stdenv.mkDerivation (args // { 36 - NIX_CFLAGS_LINK = "-static"; 37 - 38 - # libcompat.a contains some commonly used functions. 39 - NIX_LDFLAGS = "-lcompat"; 40 - 41 - # These are added *after* the command-line flags, so we'll 42 - # always optimise for size. 43 - NIX_CFLAGS_COMPILE = 44 - args.NIX_CFLAGS_COMPILE or "" 45 - + " -Os -s -D_BSD_SOURCE=1"; 46 - 47 - configureFlags = 48 - args.configureFlags or "" 49 - + " --disable-shared"; # brrr... 50 - 51 - NIX_GCC = import ../build-support/gcc-wrapper { 52 - inherit stdenv; 53 - libc = pkgs.dietlibc; 54 - inherit (stdenv.gcc) gcc binutils nativeTools nativePrefix; 55 - nativeLibc = false; 56 - }; 57 - }); 58 - isDietLibC = true; 59 - }; 60 - 61 - 62 # Return a modified stdenv that uses klibc to create small 63 # statically linked binaries. 64 useKlibc = stdenv: klibc: stdenv //
··· 29 overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; }; 30 31 32 # Return a modified stdenv that uses klibc to create small 33 # statically linked binaries. 34 useKlibc = stdenv: klibc: stdenv //
+1 -1
pkgs/tools/compression/bzip2/default.nix
··· 24 }; 25 26 sharedLibrary = 27 - !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; 28 29 preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'"; 30
··· 24 }; 25 26 sharedLibrary = 27 + !stdenv.isDarwin && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; 28 29 preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'"; 30
-1
pkgs/tools/networking/curl/7.15.nix
··· 43 44 dontDisableStatic = linkStatic; 45 46 - CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; 47 LDFLAGS = if linkStatic then "-static" else ""; 48 CXX = "g++"; 49 CXXCPP = "g++ -E";
··· 43 44 dontDisableStatic = linkStatic; 45 46 LDFLAGS = if linkStatic then "-static" else ""; 47 CXX = "g++"; 48 CXXCPP = "g++ -E";
-1
pkgs/tools/networking/curl/default.nix
··· 47 48 dontDisableStatic = linkStatic; 49 50 - CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; 51 LDFLAGS = if linkStatic then "-static" else ""; 52 CXX = "g++"; 53 CXXCPP = "g++ -E";
··· 47 48 dontDisableStatic = linkStatic; 49 50 LDFLAGS = if linkStatic then "-static" else ""; 51 CXX = "g++"; 52 CXXCPP = "g++ -E";