From 08f68313a47a2093dc0f408a706b2c125bc59c95 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: treewide: remove redundant rec --- pkgs/development/libraries/phonon/backends/gstreamer.nix | 2 +- pkgs/development/libraries/phonon/backends/vlc.nix | 2 +- pkgs/development/libraries/phonon/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/phonon') diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 67f343d603806..ef7633dadaf36 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -14,7 +14,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 829ecdb86e064..98c6be85672c3 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -15,7 +15,7 @@ assert withQt4 -> qt4 != null; assert !withQt4 -> qtbase != null; assert !withQt4 -> qtx11extras != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${if withQt4 then "qt4" else "qt5"}-${v}"; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2dd0cc10c947c..dc32c4ebfb054 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -15,7 +15,7 @@ in assert withQt5 -> qtbase != null; assert withQt5 -> qttools != null; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { -- cgit 1.4.1