diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-11 20:16:09 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-11 20:16:09 +0000 |
| commit | b368b4b199aa81207f9804aa0783d9a03e0356f8 (patch) | |
| tree | ffe3c64dbd6d9ae4542710d342d1549cb7ea0441 /pkgs/os-specific | |
| parent | 51f6aec764ffb473508dcc8095ce68c20fdab48d (diff) | |
| download | nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar.gz nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar.bz2 nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar.lz nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar.xz nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.tar.zst nixpkgs-b368b4b199aa81207f9804aa0783d9a03e0356f8.zip | |
Making more packages build on the Fuloong2f.
I still can't build the kernel because it requires binutils yet to be released. svn path=/nixpkgs/branches/stdenv-updates/; revision=23132
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 77d53adeb81..c9618bf07e6 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,19 +1,22 @@ { stdenv, fetchurl, bison, flex, autoconf, automake }: stdenv.mkDerivation rec { - name = "kbd-1.15.1"; + name = "kbd-1.15.2"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "1klrxas8vjikx6jm6m2lcpmn88lhxb6p3whwgdwq9d9flf1qrf4i"; + sha256 = "19pb44m5m0mcgjkmgkjx4fn8j2m4xwqx4g7w2y1nlypg3qcjsq5k"; }; buildInputs = [ bison flex autoconf automake ]; - # We get a warning in armv5tel-linux, so we disable -Werror in it - patchPhase = if (stdenv.system == "armv5tel-linux") then '' - sed -i s/-Werror// src/Makefile.am - '' else ""; + # We get a warning in armv5tel-linux and the fuloong2f, + # so we disable -Werror in it + patchPhase = if (stdenv.system == "armv5tel-linux" || + stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux") + then '' + sed -i s/-Werror// src/Makefile.am + '' else ""; # Grrr, kbd 1.15.1 doesn't include a configure script. preConfigure = "autoreconf"; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 59c2deab47f..6b0526c3569 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation { }; buildInputs = [ flex cracklib ] - ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux") libxcrypt; + ++ stdenv.lib.optional + (stdenv.system != "armv5tel-linux" && stdenv.system != "ict_loongson-2_v0.3_fpu_v0.1-linux") + libxcrypt; preConfigure = '' configureFlags="$configureFlags --includedir=$out/include/security" |