From 4f8b4069e5dbfdb319fa394f0f3b3fa9aa10d673 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Tue, 24 Jan 2017 15:26:03 +0300 Subject: [PATCH] quodlibet: rename to quodlibet, quodlibet-without-gst-plugins The gst-plugin-less version is barely useful out of the box, so it is the one that should be relegated to a less prominent spot in the namespace. --- pkgs/applications/audio/quodlibet/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index dd3a0b4a1c6..0546f9a0ad2 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -12,7 +12,7 @@ let inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet - name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; + name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}"; # XXX, tests fail doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3a55ceab2f..b0189355fdc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14728,9 +14728,9 @@ with pkgs; quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {}; - quodlibet = callPackage ../applications/audio/quodlibet { }; + quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { }; - quodlibet-with-gst-plugins = callPackage ../applications/audio/quodlibet { + quodlibet = callPackage ../applications/audio/quodlibet { withGstPlugins = true; gst_plugins_bad = null; };