gperf: bring back 3.0.4 to fix systemd build

Systemd has fixed this on master, but I don't want to meddle with the
patch that doesn't apply cleanly on our version.
This commit is contained in:
Vladimír Čunát 2017-01-18 16:45:52 +01:00
parent 0dc43ab9d6
commit 59e0cfb589
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 35 additions and 0 deletions

View File

@ -0,0 +1,33 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "gperf-3.0.4";
src = fetchurl {
url = "mirror://gnu/gperf/${name}.tar.gz";
sha256 = "0gnnm8iqcl52m8iha3sxrzrl9mcyhg7lfrhhqgdn4zj00ji14wbn";
};
meta = {
description = "Perfect hash function generator";
longDescription = ''
GNU gperf is a perfect hash function generator. For a given
list of strings, it produces a hash function and hash table, in
form of C or C++ code, for looking up a value depending on the
input string. The hash function is perfect, which means that
the hash table has no collisions, and the hash table lookup
needs a single string comparison only.
GNU gperf is highly customizable. There are options for
generating C or C++ code, for emitting switch statements or
nested ifs instead of a hash table, and for tuning the algorithm
employed by gperf.
'';
license = stdenv.lib.licenses.gpl3Plus;
homepage = http://www.gnu.org/software/gperf/;
platforms = stdenv.lib.platforms.unix;
};
}

View File

@ -6354,6 +6354,7 @@ in
gradle_2_5 = self.gradleGen.gradle_2_5;
gperf = callPackage ../development/tools/misc/gperf { };
gperf_3_0 = callPackage ../development/tools/misc/gperf/3.0.x.nix { };
grail = callPackage ../development/libraries/grail { };
@ -11723,6 +11724,7 @@ in
systemd = callPackage ../os-specific/linux/systemd {
utillinux = utillinuxMinimal; # break the cyclic dependency
gperf = gperf_3_0; # fix build until v233
}
// {
udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm