diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-18 13:35:50 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-18 13:35:50 +0100 |
commit | 088d7c9f3ba50da9949ac6e8961e83e0e9226e29 (patch) | |
tree | 263b017a6f7e673ccc59f88b22d79a969d7f6bcc /pkgs/os-specific/linux/ffado/default.nix | |
parent | 9a2914a4f32b26db7175c963b03a78c6fa9921f9 (diff) | |
download | nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar.gz nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar.bz2 nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar.lz nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar.xz nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.tar.zst nixpkgs-088d7c9f3ba50da9949ac6e8961e83e0e9226e29.zip |
libffado: 2.3.0 -> 2.4.0 (maintenance)
http://ffado.org/?q=node/3379 This fixes build with gcc7. The removed patches are inside now.
Diffstat (limited to 'pkgs/os-specific/linux/ffado/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/ffado/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index aa273ec613e..4e2d2b38841 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { name = "${prefix}ffado-${version}"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "122z8gya60nyg47i738z2yr4qcjyk2xix4kwhf5ybkmp23kcgqqq"; + sha256 = "14rprlcd0gpvg9kljh0zzjzd2rc9hbqqpjidshxxjvvfh4r00f4f"; }; nativeBuildInputs = [ scons pkgconfig which makeWrapper python ]; @@ -41,12 +41,8 @@ stdenv.mkDerivation rec { optXdg_utils libxmlxx glibmm ]; - patches = [ - ./gcc6.patch - ./glibc226.patch - ]; - postPatch = '' + sed '1iimport sys' -i SConstruct # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch # Let's just skip this and tell it which to build sed '/def is_userspace_32bit(cpuinfo):/a\ |