Merge #287468: pkgsMusl.ffado: fix build

...into staging

+14
+14
pkgs/os-specific/linux/ffado/default.nix
··· 1 { lib 2 , mkDerivation 3 , dbus 4 , dbus_cplusplus 5 , desktop-file-utils 6 , fetchurl 7 , glibmm 8 , kernel 9 , libavc1394 ··· 41 patches = [ 42 # fix installing metainfo file 43 ./fix-build.patch 44 ]; 45 46 outputs = [ "out" "bin" "dev" ]; ··· 79 libraw1394 80 libxmlxx3 81 python 82 ]; 83 84 enableParallelBuilding = true; 85 dontWrapQtApps = true;
··· 1 { lib 2 + , stdenv 3 , mkDerivation 4 + , argp-standalone 5 , dbus 6 , dbus_cplusplus 7 , desktop-file-utils 8 , fetchurl 9 + , fetchpatch 10 , glibmm 11 , kernel 12 , libavc1394 ··· 44 patches = [ 45 # fix installing metainfo file 46 ./fix-build.patch 47 + 48 + (fetchpatch { 49 + name = "musl.patch"; 50 + url = "http://subversion.ffado.org/changeset?format=diff&new=2846&old=2845"; 51 + stripLen = 2; 52 + hash = "sha256-iWeYnb5J69Uvo1lftc7MWg7WrLa+CGZyOwJPOe8/PKg="; 53 + }) 54 ]; 55 56 outputs = [ "out" "bin" "dev" ]; ··· 89 libraw1394 90 libxmlxx3 91 python 92 + ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ 93 + argp-standalone 94 ]; 95 + 96 + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isGnu) "-largp"; 97 98 enableParallelBuilding = true; 99 dontWrapQtApps = true;