From c814d72b517bb201c8bbbfc64e386c7023352886 Mon Sep 17 00:00:00 2001 From: volth Date: Tue, 13 Aug 2019 21:52:01 +0000 Subject: treewide: name -> pname --- pkgs/os-specific/windows/libgnurx/default.nix | 5 +++-- pkgs/os-specific/windows/mingw-w64/default.nix | 3 ++- pkgs/os-specific/windows/pthread-w32/default.nix | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific/windows') diff --git a/pkgs/os-specific/windows/libgnurx/default.nix b/pkgs/os-specific/windows/libgnurx/default.nix index 88af53dd046e..fedfea15ccb0 100644 --- a/pkgs/os-specific/windows/libgnurx/default.nix +++ b/pkgs/os-specific/windows/libgnurx/default.nix @@ -3,9 +3,10 @@ let version = "2.5.1"; in stdenv.mkDerivation rec { - name = "libgnurx-${version}"; + pname = "libgnurx"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${name}-src.tar.gz"; + url = "mirror://sourceforge/mingw/Other/UserContributed/regex/mingw-regex-${version}/mingw-${pname}-${version}-src.tar.gz"; sha256 = "0xjxcxgws3bblybw5zsp9a4naz2v5bs1k3mk8dw00ggc0vwbfivi"; }; diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index a7d4f09b90e9..022aaffe5961 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -3,7 +3,8 @@ let version = "5.0.4"; in stdenv.mkDerivation { - name = "mingw-w64-${version}"; + pname = "mingw-w64"; + inherit version; src = fetchurl { url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2"; diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index de0f36dac5fa..286f4a0d41fb 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "pthreads-w32-${version}"; + pname = "pthreads-w32"; version = "2.9.1"; src = fetchzip { -- cgit v1.2.3