diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-22 06:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 06:01:44 +0000 |
| commit | 2e00ed442014f6e095fb20cc1daec82c2a19b03e (patch) | |
| tree | adfdbfcd5efa1d42cc1f544b4dbb015d2e096c51 /pkgs/applications/audio/strawberry/default.nix | |
| parent | 5870dfba88f173dc1e5487483ba0477dedc0ca45 (diff) | |
| parent | 5990961c7295ac966899882990325abb8fa555fd (diff) | |
| download | nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.gz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.bz2 nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.lz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.xz nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.tar.zst nixpkgs-2e00ed442014f6e095fb20cc1daec82c2a19b03e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/audio/strawberry/default.nix')
| -rw-r--r-- | pkgs/applications/audio/strawberry/default.nix | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index a1cba439c49..6cc55650220 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -19,18 +19,19 @@ , protobuf , sqlite , taglib -, libpulseaudio ? null -, libselinux ? null -, libsepol ? null -, p11-kit ? null -, util-linux ? null +, libpulseaudio +, libselinux +, libsepol +, p11-kit +, util-linux , qtbase , qtx11extras , qttools , withGstreamer ? true -, gst_all_1 ? null +, glib-networking +, gst_all_1 , withVlc ? true -, libvlc ? null +, libvlc }: mkDerivation rec { @@ -61,20 +62,18 @@ mkDerivation rec { taglib qtbase qtx11extras - ] - ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ libpulseaudio libselinux libsepol p11-kit - ] - ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ lib.optionals withGstreamer (with gst_all_1; [ + glib-networking gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly - ]) - ++ lib.optional withVlc libvlc; + ]) ++ lib.optional withVlc libvlc; nativeBuildInputs = [ cmake @@ -85,8 +84,11 @@ mkDerivation rec { util-linux ]; - postInstall = '' - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + postInstall = lib.optionalString withGstreamer '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ) ''; meta = with lib; { |