Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions pkgs/by-name/li/libvisual/package.nix

This file was deleted.

8 changes: 2 additions & 6 deletions pkgs/development/libraries/gstreamer/base/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
, isocodes
, libjpeg
, libpng
, libvisual
, tremor # provides 'virbisidec'
, libGL
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
Expand Down Expand Up @@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
libdrm
libGL
libvisual
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
OpenGL
] ++ lib.optionals enableAlsa [
Expand All @@ -124,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}"
(lib.mesonEnable "introspection" withIntrospection)
(lib.mesonEnable "doc" enableDocumentation)
(lib.mesonEnable "libvisual" false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fine to remove this line now.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's enabled by default, but I'll double check

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, without this line building gst-plugins-base fails with

Run-time dependency libvisual-0.4 found: NO (tried pkgconfig)

ext/libvisual/meson.build:6:16: ERROR: Dependency "libvisual-0.4" not found, tried pkgconfig

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right.

] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"-Dtests=disabled"
]
Expand All @@ -132,10 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional (!enableGl) "-Dgl=disabled"
++ lib.optional (!enableAlsa) "-Dalsa=disabled"
++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled"
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-Ddrm=disabled"
"-Dlibvisual=disabled"
];
++ lib.optional stdenv.hostPlatform.isDarwin "-Ddrm=disabled";

postPatch = ''
patchShebangs \
Expand Down