Skip to content

Commit

Permalink
Merge pull request #175647 from Mindavi/gstreamer-good/cross
Browse files Browse the repository at this point in the history
gstreamer-good: support cross-compilation
  • Loading branch information
Mindavi authored Jun 2, 2022
2 parents 927f172 + 43edcbf commit de75100
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
8 changes: 8 additions & 0 deletions pkgs/development/libraries/gstreamer/good/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
, xorg
, libgudev
, wavpack
, glib
}:

assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch64);
Expand All @@ -57,13 +58,20 @@ stdenv.mkDerivation rec {
sha256 = "1al4f35mx41cy2h6agvmsqkjfchsyfs0iyxzpv6pnl0xh9pqfriw";
};

strictDeps = true;

depsBuildBuild = [ pkg-config ];

nativeBuildInputs = [
pkg-config
python3
meson
ninja
gettext
nasm
orc
libshout
glib
] ++ lib.optionals stdenv.isLinux [
wayland-protocols
];
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/libraries/libshout/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ stdenv.mkDerivation rec {

outputs = [ "out" "dev" "doc" ];

depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ libvorbis libtheora speex ];

Expand Down

0 comments on commit de75100

Please sign in to comment.