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

all-packages: fix earlier merge

Browse Source
This commit is contained in:
Robin Gloster 2019-07-30 13:52:38 +02:00
parent 1937c91470
commit 2903d295c4
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3911,7 +3911,6 @@ in
}; };
ipmitool = callPackage ../tools/system/ipmitool { ipmitool = callPackage ../tools/system/ipmitool {
static = false;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;
}; };
@ -5267,24 +5266,6 @@ in
pngout = callPackage ../tools/graphics/pngout { }; pngout = callPackage ../tools/graphics/pngout { };
hurdPartedCross =
if targetPlatform != buildPlatform && targetPlatform.config == "i586-pc-gnu"
then (makeOverridable
({ hurd }:
(parted.override {
# Needs the Hurd's libstore.
inherit hurd;
# The Hurd wants a libparted.a.
enableStatic = true;
gettext = null;
readline = null;
devicemapper = null;
}).crossDrv)
{ hurd = gnu.hurdCrossIntermediate; })
else null;
ipsecTools = callPackage ../os-specific/linux/ipsec-tools { ipsecTools = callPackage ../os-specific/linux/ipsec-tools {
flex = flex_2_5_35; flex = flex_2_5_35;
openssl = openssl_1_0_2; openssl = openssl_1_0_2;