Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

initial vdr plugin xineliboutput-2.1.0 #63113

Merged
merged 2 commits into from Jun 20, 2019
Merged

initial vdr plugin xineliboutput-2.1.0 #63113

merged 2 commits into from Jun 20, 2019

Conversation

ck3d
Copy link
Contributor

@ck3d ck3d commented Jun 14, 2019 •
edited

Needed to patch package xineLib to fix usage of XINE_PLUGIN_PATH .

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ck3d
initial vdr plugin xineliboutput-2.1.0
8eafd21 
Needed to patch package xineLib to fix usage of XINE_PLUGIN_PATH .
markuskowa
markuskowa reviewed Jun 15, 2019
View reviewed changes
pkgs/applications/video/vdr/xineliboutput/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vdr/xineliboutput/default.nix Outdated Show resolved Hide resolved
pkgs/applications/video/vdr/plugins.nix
@@ -11,6 +12,8 @@ let
};
in {

xineliboutput = callPackage ./xineliboutput {};
Copy link
Member

Choose a reason for hiding this comment

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

Is there a particular motivation to put this plugin in a separate file when all other plugin derivations are embedded in this file?

Copy link
Contributor

Choose a reason for hiding this comment

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

It is in line with the Nixpkgs trend of breaking down megafiles.

Copy link
Member

Choose a reason for hiding this comment

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

I am on board with breaking up huge files. In this case it would be straight forward to give every plugin it's own file?

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 also, this file should be splitted.

@markuskowa
Copy link
Member

markuskowa commented Jun 15, 2019 •
edited

@GrahamcOfBorg build wrapVdr
@GrahamcOfBorg build vdrPlugins

@ck3d
Copy link
Contributor Author

ck3d commented Jun 17, 2019

Thanks a lot for the valuable comments. I could take every hint into account.

@markuskowa markuskowa merged commit 02128a8 into NixOS:master Jun 20, 2019
@markuskowa
Copy link
Member

@volth I not sure I understand why mesa_noglu breaks ofborg evaluations since this PR evaluated just fine with ofborg. mesa_noglu is also used in other derivations.

@markuskowa
Copy link
Member

mesa_noglu is also used in other derivations.
No, it is not

Just using grep gives plenty of hits (that why I am a bit surprised it caused a problem here):

pkgs/applications/graphics/fbida/default.nix:, epoxy, poppler, mesa_noglu, lirc }:
pkgs/applications/graphics/fbida/default.nix:    mesa_noglu
pkgs/applications/misc/lutris/default.nix:    fluidsynth hidapi mesa_noglu libdrm
pkgs/applications/video/vdr/xineliboutput/default.nix:, xineLib, libjpeg, libextractor, mesa_noglu, libGLU
pkgs/applications/video/vdr/xineliboutput/default.nix:      mesa_noglu
pkgs/applications/virtualization/qemu/default.nix:, openGLSupport ? sdlSupport, mesa_noglu, epoxy, libdrm
pkgs/applications/virtualization/qemu/default.nix:    ++ optionals openGLSupport [ mesa_noglu epoxy libdrm ]
pkgs/applications/window-managers/weston/default.nix:{ stdenv, fetchurl, meson, ninja, pkgconfig, wayland, libGL, mesa_noglu, libxkbcommon, cairo, libxcb
pkgs/applications/window-managers/weston/default.nix:    wayland libGL mesa_noglu libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
pkgs/build-support/appimage/default.nix:      mesa_noglu
pkgs/desktops/enlightenment/enlightenment.nix:  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_noglu,
pkgs/desktops/enlightenment/enlightenment.nix:    mesa_noglu
pkgs/desktops/enlightenment/ephoto.nix:{ stdenv, fetchurl, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
pkgs/desktops/enlightenment/ephoto.nix:    mesa_noglu.dev # otherwise pkg-config does not find gbm
pkgs/desktops/enlightenment/rage.nix:{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, gst_all_1, pcre, mesa_noglu, wrapGAppsHook }:
pkgs/desktops/enlightenment/rage.nix:    mesa_noglu.dev
pkgs/desktops/enlightenment/efl.nix:, curl, libinput, systemd, mesa_noglu, writeText, gtk3
pkgs/desktops/enlightenment/efl.nix:  buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGL mesa_noglu
pkgs/desktops/enlightenment/terminology.nix:{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
pkgs/desktops/enlightenment/terminology.nix:    mesa_noglu
pkgs/development/compilers/halide/default.nix:, libpng, libjpeg, mesa_noglu, eigen, openblas
pkgs/development/compilers/halide/default.nix:  buildInputs = [ llvmPackages.llvm libpng libjpeg mesa_noglu eigen openblas ];
pkgs/development/libraries/cogl/default.nix:, mesa_noglu
pkgs/development/libraries/cogl/default.nix:      glib gdk_pixbuf gobject-introspection wayland mesa_noglu
pkgs/development/libraries/gtk+/3.x.nix:, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
pkgs/development/libraries/gtk+/3.x.nix:    ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
pkgs/development/libraries/soil/default.nix:{ stdenv, fetchurl, unzip, mesa_noglu, libX11 }:
pkgs/development/libraries/soil/default.nix:  buildInputs = [ unzip mesa_noglu libX11 ];
pkgs/development/libraries/virglrenderer/default.nix:{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11, libdrm, mesa_noglu }:
pkgs/development/libraries/virglrenderer/default.nix:  buildInputs = [ libGLU epoxy libX11 libdrm mesa_noglu ];
pkgs/development/libraries/wlc/default.nix:, libX11, dbus, wayland-protocols, libdrm, mesa_noglu
pkgs/development/libraries/wlc/default.nix:    libpthreadstubs libXdmcp libXext libdrm mesa_noglu ]
pkgs/development/libraries/wlroots/default.nix:, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa_noglu
pkgs/development/libraries/wlroots/default.nix:    xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa_noglu
pkgs/games/steam/chrootenv.nix:    mesa_noglu
pkgs/games/tdm/default.nix:{ stdenv, fetchurl, binutils-unwrapped, scons, gnum4, p7zip, glibc_multi, mesa_noglu
pkgs/games/tdm/default.nix:    glibc_multi mesa_noglu.dev xorg.libX11.dev openal
pkgs/misc/emulators/wine/base.nix:  ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ]
pkgs/os-specific/linux/kmscube/default.nix:{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa_noglu, pkgconfig }:
pkgs/os-specific/linux/kmscube/default.nix:  buildInputs = [ libdrm libX11 libGL mesa_noglu ];
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl:$pcMap{"gbm"} = "mesa_noglu";
pkgs/servers/x11/xorg/default.nix:  xf86videoamdgpu = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, xorgserver }: stdenv.mkDerivation {
pkgs/servers/x11/xorg/default.nix:    buildInputs = [ xorgproto mesa_noglu libGL libdrm udev xorgserver ];
pkgs/servers/x11/xorg/default.nix:  xf86videoati = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, mesa_noglu, libGL, libdrm, udev, libpciaccess, xorgserver }: stdenv.mkDerivation {
pkgs/servers/x11/xorg/default.nix:    buildInputs = [ xorgproto mesa_noglu libGL libdrm udev libpciaccess xorgserver ];
pkgs/servers/x11/xorg/overrides.nix:  mesa_noglu, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook,
pkgs/servers/x11/xorg/overrides.nix:    buildInputs =  attrs.buildInputs ++ [ mesa_noglu llvm_6 ]; # for libxatracker
pkgs/servers/x11/xorg/overrides.nix:        buildInputs = commonBuildInputs ++ [ libdrm mesa_noglu ];
pkgs/tools/X11/primus/lib.nix:, libX11, libGL, mesa_noglu
pkgs/tools/X11/primus/lib.nix:                "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so"
pkgs/tools/graphics/asymptote/default.nix:  , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv
pkgs/tools/graphics/asymptote/default.nix:     [ freeglut libGLU libGL mesa_noglu.osmesa ]
pkgs/tools/graphics/glmark2/default.nix:  python27, wayland, udev, mesa_noglu, wafHook }:
pkgs/tools/graphics/glmark2/default.nix:    libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa_noglu
pkgs/top-level/all-packages.nix:          else mesa_noglu.stubs;
pkgs/top-level/all-packages.nix:  mesa_noglu = callPackage ../development/libraries/mesa {
pkgs/top-level/all-packages.nix:  mesa = mesa_noglu;
pkgs/top-level/all-packages.nix:  mesa_drivers = mesa_noglu.drivers;

matthewbauer added a commit that referenced this pull request Jun 20, 2019
@matthewbauer
Merge pull request #63584 from volth/patch-344
3d86336 
fix ofborg evaluations broken in #63113
@markuskowa
Copy link
Member

OK. We are looking at two different branches. Master produces the hits that I posted above. Has staging diverged too much?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@markuskowa markuskowa markuskowa approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ck3d @markuskowa @jtojnar