Skip to content

Commit

Permalink
pkgs: linux-show-player: fixes final issues.
Browse files Browse the repository at this point in the history
* do not do double wrapping. See: https://github.com/NixOS/nixpkgs/blob/nixos-23.11/doc/languages-frameworks/gnome.section.md#when-using-wrapgappshook-with-special-derivers-you-can-end-up-with-double-wrapped-binaries-ssec-gnome-common-issues-double-wrapped
  there is probably a better of doing this, but for now this works.
* finally fix gi issues, NixOS/nixpkgs#56943 (comment) helped, but including wrapGAppsHook was also part of the fix.
* cleanup dependencies, there is no need for gi to exist in propagatedBuildInputs and BuildInputs.
  • Loading branch information
MichaelPachec0 committed Apr 3, 2024
1 parent f417769 commit c764fd6
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions nix/linux-show-player.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, python3, fetchFromGitHub, fetchPypi, libjack2, alsa-lib, qt5, gst_all_1
, rtmidi, ola, gobject-introspection, cairo, liblo, gnome3, libadwaita }:
, rtmidi, ola, gobject-introspection, cairo, liblo, libadwaita, wrapGAppsHook }:
let
jack-client = python3.pkgs.buildPythonPackage rec {
pname = "JACK-Client";
Expand All @@ -16,7 +16,6 @@ let
src = fetchFromGitHub {
owner = "alsa-project";
repo = "alsa-python";
# this is for tag v1.2.7
rev = "v${version}";
hash = "sha256-oldWPVtRAL81VZmftnEr7DhmDONpXZkBr91tfII/m2Y=";
};
Expand All @@ -34,12 +33,13 @@ in python3.pkgs.buildPythonApplication rec {
hash = "sha256-vaYnB7/FZAIql2LPd9QlLV5PVQEtSiPIoU0N1xN+VBM=";
};

buildInputs = [ qt5.qtwayland ];
buildInputs = [ qt5.qtwayland gobject-introspection ];
nativeBuildInputs = [
python3.pkgs.poetry-core
qt5.wrapQtAppsHook
libadwaita
gnome3.adwaita-icon-theme
wrapGAppsHook
gobject-introspection
];

propagatedBuildInputs = (with python3.pkgs; [
Expand All @@ -57,18 +57,20 @@ in python3.pkgs.buildPythonApplication rec {
requests
sortedcontainers
packaging
]) ++ [ gobject-introspection cairo liblo rtmidi ola libjack2 ]
++ (with gst_all_1; [
gstreamer
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
gst-libav
gst-plugins-base
]);
]) ++ (with gst_all_1; [
gstreamer
gst-plugins-good
gst-plugins-ugly
gst-plugins-bad
gst-libav
gst-plugins-base
]) ++ [ cairo liblo rtmidi ola ];

# NOTE: assuming this is not the way to avoid double wrapping. This still works, so keep it for now.
dontWrapQtApps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ];
dontWrapGAppps = true;
makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}" ];

# TODO: fix this.
# pythonImportsCheck = [ "linux_show_player" ];

Expand Down

0 comments on commit c764fd6

Please sign in to comment.