public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove static packages

Browse Source 
Nixpkgs is meant to link everything dynamically. We don’t want to
expose static packages at the top level. If some package needs
statically built binaries, it should use a custom override.
This commit is contained in:
Matthew Bauer 2018-12-04 21:10:45 -06:00
parent a3a6ad7a01
commit b966d3c583
2 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/system/proot/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch { stdenv, fetchFromGitHub, fetchpatch
, talloc, docutils , talloc, docutils }:
, enableStatic ? true }:
({ version, rev, sha256, patches }: stdenv.mkDerivation { ({ version, rev, sha256, patches }: stdenv.mkDerivation {
name = "proot-${version}"; name = "proot-${version}";
@ -12,17 +11,13 @@
owner = "cedric-vincent"; owner = "cedric-vincent";
}; };
buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static; buildInputs = [ talloc ];
nativeBuildInputs = [ docutils ]; nativeBuildInputs = [ docutils ];
enableParallelBuilding = true; enableParallelBuilding = true;
inherit patches; inherit patches;
preBuild = stdenv.lib.optionalString enableStatic ''
export LDFLAGS="-static"
'';
makeFlags = [ "-C src" ]; makeFlags = [ "-C src" ];
postBuild = '' postBuild = ''

34
pkgs/top-level/all-packages.nix
View File

@ -3488,9 +3488,7 @@ in
buildGoPackage = buildGo110Package; buildGoPackage = buildGo110Package;
}; };
ipmitool = callPackage ../tools/system/ipmitool { ipmitool = callPackage ../tools/system/ipmitool { };
static = false;
};
ipmiutil = callPackage ../tools/system/ipmiutil {}; ipmiutil = callPackage ../tools/system/ipmiutil {};
@ -3983,8 +3981,6 @@ in
libiberty = callPackage ../development/libraries/libiberty { }; libiberty = callPackage ../development/libraries/libiberty { };
libiberty_static = libiberty.override { staticBuild = true; };
libxc = callPackage ../development/libraries/libxc { }; libxc = callPackage ../development/libraries/libxc { };
libxcomp = callPackage ../development/libraries/libxcomp { }; libxcomp = callPackage ../development/libraries/libxcomp { };
@ -4902,7 +4898,9 @@ in
plowshare = callPackage ../tools/misc/plowshare { }; plowshare = callPackage ../tools/misc/plowshare { };
pngcheck = callPackage ../tools/graphics/pngcheck { pngcheck = callPackage ../tools/graphics/pngcheck {
zlib = zlibStatic; zlib = zlib.override {
static = true;
};
}; };
pngcrush = callPackage ../tools/graphics/pngcrush { }; pngcrush = callPackage ../tools/graphics/pngcrush { };
@ -5210,7 +5208,7 @@ in
routino = callPackage ../tools/misc/routino { }; routino = callPackage ../tools/misc/routino { };
rq = callPackage ../development/tools/rq { rq = callPackage ../development/tools/rq {
v8 = v8_static; v8 = v8.override { static = true; };
}; };
rsnapshot = callPackage ../tools/backup/rsnapshot { }; rsnapshot = callPackage ../tools/backup/rsnapshot { };
@ -8028,7 +8026,9 @@ in
tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm {
v8_static = v8.override { static = true; };
};
wasm-gc = callPackage ../development/interpreters/wasm-gc { }; wasm-gc = callPackage ../development/interpreters/wasm-gc { };
@ -8450,7 +8450,9 @@ in
lattice-diamond = callPackage ../development/tools/lattice-diamond { }; lattice-diamond = callPackage ../development/tools/lattice-diamond { };
distcc = callPackage ../development/tools/misc/distcc { }; distcc = callPackage ../development/tools/misc/distcc {
libiberty_static = libiberty.override { staticBuild = true; };
};
# distccWrapper: wrapper that works as gcc or g++ # distccWrapper: wrapper that works as gcc or g++
# It can be used by setting in nixpkgs config like this, for example: # It can be used by setting in nixpkgs config like this, for example:
@ -8811,7 +8813,9 @@ in
openocd = callPackage ../development/tools/misc/openocd { }; openocd = callPackage ../development/tools/misc/openocd { };
oprofile = callPackage ../development/tools/profiling/oprofile { }; oprofile = callPackage ../development/tools/profiling/oprofile {
libiberty_static = libiberty.override { staticBuild = true; };
};
pahole = callPackage ../development/tools/misc/pahole {}; pahole = callPackage ../development/tools/misc/pahole {};
@ -12712,8 +12716,6 @@ in
stdenv = overrideCC stdenv gcc6; stdenv = overrideCC stdenv gcc6;
}); });
v8_static = lowPrio (res.v8.override { static = true; });
vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { };
@ -12948,10 +12950,6 @@ in
zlog = callPackage ../development/libraries/zlog { }; zlog = callPackage ../development/libraries/zlog { };
zlibStatic = lowPrio (appendToName "static" (zlib.override {
static = true;
}));
zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {};
zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {};
zeromq = zeromq4; zeromq = zeromq4;
@ -20610,7 +20608,9 @@ in
openspades = callPackage ../games/openspades { }; openspades = callPackage ../games/openspades { };
openttd = callPackage ../games/openttd { openttd = callPackage ../games/openttd {
zlib = zlibStatic; zlib = zlib.override {
static = true;
};
}; };
opentyrian = callPackage ../games/opentyrian { }; opentyrian = callPackage ../games/opentyrian { };