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

kbd: Hard-code the path to gzip/bzip2

Browse Source 
This is necessary for systemd-vconsole-setup.service in systemd.
This commit is contained in:
Eelco Dolstra 2012-07-24 13:10:53 -04:00
parent 912440dae8
commit 99413d3e3c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/kbd/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, flex, autoconf, automake }: { stdenv, fetchurl, bison, flex, autoconf, automake, gzip, bzip2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kbd-1.15.2"; name = "kbd-1.15.2";
@ -10,13 +10,19 @@ stdenv.mkDerivation rec {
buildNativeInputs = [ bison flex autoconf automake ]; buildNativeInputs = [ bison flex autoconf automake ];
# We get a warning in armv5tel-linux and the fuloong2f, patchPhase =
# so we disable -Werror in it ''
patchPhase = if (stdenv.isArm || # Fix the path to gzip/bzip2.
stdenv.system == "mips64el-linux") substituteInPlace src/findfile.c \
then '' --replace gzip ${gzip}/bin/gzip \
sed -i s/-Werror// src/Makefile.am --replace bzip2 ${bzip2}/bin/bzip2 \
'' else "";
# We get a warning in armv5tel-linux and the fuloong2f, so we
# disable -Werror in it.
${stdenv.lib.optionalString (stdenv.isArm || stdenv.system == "mips64el-linux") ''
sed -i s/-Werror// src/Makefile.am
''}
'';
# Grrr, kbd 1.15.1 doesn't include a configure script. # Grrr, kbd 1.15.1 doesn't include a configure script.
preConfigure = "autoreconf"; preConfigure = "autoreconf";