Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'

8 files changed, 15 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix
index 21adf3b972a5..ad9d5fb86905 100644
--- a/nixpkgs/pkgs/tools/audio/aucdtect/default.nix
+++ b/nixpkgs/pkgs/tools/audio/aucdtect/default.nix
@@ -3,26 +3,29 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  pname = "aucdtext";
+  pname = "aucdtect";
   version = "0.8-2";
 
   src = fetchurl {
-    url = "http://www.true-audio.com/ftp/aucdtect-${version}.i586.rpm";
+    url = "http://www.true-audio.com/ftp/${pname}-${version}.i586.rpm";
     sha256 = "1lp5f0rq5b5n5il0c64m00gcfskarvgqslpryms9443d200y6mmd";
   };
 
   unpackCmd = "${rpmextract}/bin/rpmextract $src";
 
   installPhase = ''
-    mkdir -p $out/bin
-    install -m755 local/bin/auCDtect $out/bin/aucdtect
+    runHook preInstall
+
+    install -Dm755 local/bin/auCDtect $out/bin/aucdtect
+
+    runHook postInstall
   '';
 
   dontStrip = true;
 
   meta = with stdenv.lib; {
     description = "Verify authenticity of lossless audio files";
-    homepage = http://tausoft.org;
+    homepage = "http://tausoft.org";
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
diff --git a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
index 3c9cc5639a8f..fac37962f3cf 100644
--- a/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
+++ b/nixpkgs/pkgs/tools/audio/beets/copyartifacts-plugin.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, beets, pythonPackages, glibcLocales }:
 
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
   name = "beets-copyartifacts";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/tools/audio/mididings/default.nix b/nixpkgs/pkgs/tools/audio/mididings/default.nix
index fb3d0e51341c..35d1af1e7676 100644
--- a/nixpkgs/pkgs/tools/audio/mididings/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mididings/default.nix
@@ -1,6 +1,6 @@
 { stdenv, pythonPackages, fetchFromGitHub, pkg-config, glib, alsaLib, libjack2  }:
 
-pythonPackages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication {
   version = "20151117";
   pname = "mididings";
 
diff --git a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
index 19f670793ba2..acd11bc75e6f 100644
--- a/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mp3cat/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   makeFlags = [
-    "PREFIX=${placeholder ''out''}"
+    "PREFIX=${placeholder "out"}"
   ];
 
   installTargets = [
diff --git a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
index 3b59d5aceb05..a791a81db351 100644
--- a/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
+++ b/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
@@ -6,7 +6,7 @@ let
     name = "mpdcron-bundle";
     gemdir = ./.;
   };
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   version = "20161228";
   pname = "mpdcron";
 
diff --git a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
index 239e4b3fcca3..69e5976e6d5e 100644
--- a/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
+++ b/nixpkgs/pkgs/tools/audio/pa-applet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, libpulseaudio, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, xf86inputevdev }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "pa-applet-2012-04-11";
 
   src = fetchgit {
diff --git a/nixpkgs/pkgs/tools/audio/trx/default.nix b/nixpkgs/pkgs/tools/audio/trx/default.nix
index d72cb8564373..5d31193ee8d4 100644
--- a/nixpkgs/pkgs/tools/audio/trx/default.nix
+++ b/nixpkgs/pkgs/tools/audio/trx/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "trx-unstable";
   version = "2018-01-23";
 
diff --git a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
index 36afd11aa2c3..3871bbd39a16 100644
--- a/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
+++ b/nixpkgs/pkgs/tools/audio/volumeicon/default.nix
@@ -1,6 +1,6 @@
 { pkgs, fetchurl, stdenv, gtk3, pkgconfig, intltool, alsaLib }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "volumeicon";
   version = "0.5.1";