From 8f6aa781e8b4a0414092a8795a410fcffe2152cf Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Thu, 11 Apr 2019 22:46:35 +0200 Subject: alsa-{oss,plugins}: use pname --- pkgs/os-specific/linux/alsa-oss/default.nix | 4 ++-- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 3ca783e5686..d3e7dd5fa5d 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}: stdenv.mkDerivation rec { - name = "alsa-oss-${version}"; + pname = "alsa-oss"; version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/oss-lib/${name}.tar.bz2"; + url = "mirror://alsa/oss-lib/${pname}-${version}.tar.bz2"; sha256 = "13nn6n6wpr2sj1hyqx4r9nb9bwxnhnzw8r2f08p8v13yjbswxbb4"; }; diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index 47c338de8c0..6768dac3326 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }: stdenv.mkDerivation rec { - name = "alsa-plugins-${version}"; + pname = "alsa-plugins"; version = "1.1.8"; src = fetchurl { - url = "mirror://alsa/plugins/${name}.tar.bz2"; + url = "mirror://alsa/plugins/${pname}-${version}.tar.bz2"; sha256 = "152r82i6f97gfilfgiax5prxkd4xlcipciv8ha8yrk452qbxyxvz"; }; -- cgit 1.4.1