diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/misc/emulators | |
parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/misc/emulators')
38 files changed, 54 insertions, 53 deletions
diff --git a/nixpkgs/pkgs/misc/emulators/atari++/default.nix b/nixpkgs/pkgs/misc/emulators/atari++/default.nix index 5a37b1b32c5b..2e6ccd0a4918 100644 --- a/nixpkgs/pkgs/misc/emulators/atari++/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari++/default.nix @@ -2,7 +2,7 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari++-${version}"; + pname = "atari++"; version = "1.81"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/atari800/default.nix b/nixpkgs/pkgs/misc/emulators/atari800/default.nix index 4806c7f9e0f1..228da6870947 100644 --- a/nixpkgs/pkgs/misc/emulators/atari800/default.nix +++ b/nixpkgs/pkgs/misc/emulators/atari800/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ - name = "atari800-${version}"; + pname = "atari800"; version = "4.0.0"; src = fetchurl { - url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz"; sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; }; diff --git a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix index 601503dc07ec..a725d9c9b086 100644 --- a/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix +++ b/nixpkgs/pkgs/misc/emulators/attract-mode/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "attract-mode-${version}"; + pname = "attract-mode"; version = "2.2.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/blastem/default.nix b/nixpkgs/pkgs/misc/emulators/blastem/default.nix index 666f953f6b57..88e8556ec6c3 100644 --- a/nixpkgs/pkgs/misc/emulators/blastem/default.nix +++ b/nixpkgs/pkgs/misc/emulators/blastem/default.nix @@ -3,7 +3,7 @@ let vasm = stdenv.mkDerivation rec { - name = "vasm-${version}"; + pname = "vasm"; version = "1.8c"; src = fetchFromGitHub { owner = "mbitsnbites"; @@ -19,7 +19,7 @@ let }; in stdenv.mkDerivation rec { - name = "blastem-${version}"; + pname = "blastem"; version = "0.5.1"; src = fetchurl { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; diff --git a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix index a560ecd0a21d..13cd21391f11 100644 --- a/nixpkgs/pkgs/misc/emulators/ccemux/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ccemux/default.nix @@ -34,7 +34,8 @@ let in stdenv.mkDerivation rec { - name = "ccemux-${version}"; + pname = "ccemux"; + inherit version; src = jar; dontUnpack = true; diff --git a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix index 33c5d3cebf14..71beaf125481 100644 --- a/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix +++ b/nixpkgs/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, kernel }: stdenv.mkDerivation rec { - name = "vhba-${version}"; + pname = "vhba"; version = "20190410"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/citra/default.nix b/nixpkgs/pkgs/misc/emulators/citra/default.nix index 3e8f78c44115..efa1a881f4ab 100644 --- a/nixpkgs/pkgs/misc/emulators/citra/default.nix +++ b/nixpkgs/pkgs/misc/emulators/citra/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: stdenv.mkDerivation rec { - name = "citra-${version}"; + pname = "citra"; version = "2019-05-25"; # Submodules diff --git a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix index 70e7351e295c..bdec34e396f7 100644 --- a/nixpkgs/pkgs/misc/emulators/darcnes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/darcnes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libX11, libXt, libXext, libXaw }: stdenv.mkDerivation rec { - name = "darcnes-${version}"; + pname = "darcnes"; version = "9b0401"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/desmume/default.nix b/nixpkgs/pkgs/misc/emulators/desmume/default.nix index d177012546e9..6bb5be3c7137 100644 --- a/nixpkgs/pkgs/misc/emulators/desmume/default.nix +++ b/nixpkgs/pkgs/misc/emulators/desmume/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "desmume-${version}"; + pname = "desmume"; version = "0.9.11"; src = fetchurl { - url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/desmume/desmume/${version}/${pname}-${version}.tar.gz"; sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; }; diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix index a14f18da4669..813730d435d0 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/default.nix @@ -5,7 +5,7 @@ , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix index ab8ec6868cf2..e96b2e07890e 100644 --- a/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/nixpkgs/pkgs/misc/emulators/dolphin-emu/master.nix @@ -20,7 +20,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "dolphin-emu-${version}"; + pname = "dolphin-emu"; version = "5.0-10879"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix index 9dec1ecacae0..7312ad41ada5 100644 --- a/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix +++ b/nixpkgs/pkgs/misc/emulators/emulationstation/default.nix @@ -2,7 +2,7 @@ , freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: stdenv.mkDerivation rec { - name = "emulationstation-${version}"; + pname = "emulationstation"; version = "2.0.1a"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix index edf4fe017a2e..6950e12e889a 100644 --- a/nixpkgs/pkgs/misc/emulators/epsxe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/epsxe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "epsxe-${version}"; + pname = "epsxe"; version = "2.0.5"; src = let diff --git a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix index 882bf13f4eaf..079af05e794d 100644 --- a/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix +++ b/nixpkgs/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: stdenv.mkDerivation rec { - name = "firebird-emu-${version}"; + pname = "firebird-emu"; version = "1.4"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix index 9856c93eda2d..7e1272faf11b 100644 --- a/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix +++ b/nixpkgs/pkgs/misc/emulators/fs-uae/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "fs-uae-${version}"; + pname = "fs-uae"; version = "2.8.4"; src = fetchurl { - url = "https://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + url = "https://fs-uae.net/fs-uae/stable/${version}/${pname}-${version}.tar.gz"; sha256 = "19ccb3gbpjwwazqc9pyin3jicjl27m2gyvy5bb5zysq0mxpzassj"; }; diff --git a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix index ea2d6bbfecc8..04c5b441f013 100644 --- a/nixpkgs/pkgs/misc/emulators/gxemul/default.nix +++ b/nixpkgs/pkgs/misc/emulators/gxemul/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "gxemul-${version}"; + pname = "gxemul"; version = "0.6.0.1"; src = fetchurl { - url = "http://gxemul.sourceforge.net/src/${name}.tar.gz"; + url = "http://gxemul.sourceforge.net/src/${pname}-${version}.tar.gz"; sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407"; }; @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin; - mkdir -p $out/share/${name}; + mkdir -p $out/share/${pname}-${version}; cp gxemul $out/bin; - cp -r doc $out/share/${name}; - cp -r demos $out/share/${name}; + cp -r doc $out/share/${pname}-${version}; + cp -r demos $out/share/${pname}-${version}; cp -r ./man $out/; ''; diff --git a/nixpkgs/pkgs/misc/emulators/higan/default.nix b/nixpkgs/pkgs/misc/emulators/higan/default.nix index 1349fa0f0b6f..ad96ca36bc16 100644 --- a/nixpkgs/pkgs/misc/emulators/higan/default.nix +++ b/nixpkgs/pkgs/misc/emulators/higan/default.nix @@ -10,7 +10,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "higan-${version}"; + pname = "higan"; version = "106"; sourceName = "higan_v${version}-source"; diff --git a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix index 32d3013d842c..c2494d702708 100644 --- a/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix +++ b/nixpkgs/pkgs/misc/emulators/kega-fusion/default.nix @@ -4,7 +4,7 @@ let libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ]; in stdenv.mkDerivation rec { - name = "kega-fusion-${version}"; + pname = "kega-fusion"; version = "3.63x"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index 32201c48ee98..edb70ba72648 100644 --- a/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libdsk-${version}"; + pname = "libdsk"; version = "1.5.10"; src = fetchurl { - url = "https://www.seasip.info/Unix/LibDsk/${name}.tar.gz"; + url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; sha256 = "0ndkwyf8dp252v4yhqphvi32gmz9m5kkdqwv0aw92cz7mfbnp36g"; }; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix index 9101c1587c25..74c456cfb105 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/default.nix @@ -2,11 +2,11 @@ , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { - name = "mednafen-${version}"; + pname = "mednafen"; version = "0.9.48"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; + url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; diff --git a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix index 75eeeea4c008..146d53202614 100644 --- a/nixpkgs/pkgs/misc/emulators/mednafen/server.nix +++ b/nixpkgs/pkgs/misc/emulators/mednafen/server.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; + pname = "mednafen-server"; version = "0.5.2"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix index c62d9c90ca79..40390068e7be 100644 --- a/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mednaffe/default.nix @@ -4,7 +4,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "mednaffe-${version}"; + pname = "mednaffe"; version = "0.8.6"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 039bc57e6031..6dc7bc30f322 100644 --- a/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -14,7 +14,7 @@ let startupNotify = "false"; }; in stdenv.mkDerivation rec { - name = "mgba-${version}"; + pname = "mgba"; version = "0.7.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix index 9ff99110eccf..460dd7ad5fb5 100644 --- a/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix +++ b/nixpkgs/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: stdenv.mkDerivation rec { - name = "mupen64plus-${version}"; + pname = "mupen64plus"; version = "2.5"; src = fetchurl { diff --git a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix index 5bc7bcec9d41..6bef474d7ea4 100644 --- a/nixpkgs/pkgs/misc/emulators/nestopia/default.nix +++ b/nixpkgs/pkgs/misc/emulators/nestopia/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.47"; - name = "nestopia-${version}"; + pname = "nestopia"; src = fetchFromGitHub { owner = "rdanbrook"; diff --git a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix index d2539cbc8171..8a95d6f28837 100644 --- a/nixpkgs/pkgs/misc/emulators/openmsx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/openmsx/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { - name = "openmsx-${version}"; + pname = "openmsx"; version = "git-2017-11-02"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix index 851c05c0578b..1924452e2abe 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsx2/default.nix @@ -3,7 +3,7 @@ , wxGTK30, zlib }: stdenv.mkDerivation rec { - name = "pcsx2-${version}"; + pname = "pcsx2"; version = "1.4.0"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix index 5af3042bde4d..8f1e5e02c186 100644 --- a/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix +++ b/nixpkgs/pkgs/misc/emulators/pcsxr/default.nix @@ -3,7 +3,7 @@ , fetchpatch }: stdenv.mkDerivation rec { - name = "pcsxr-${version}"; + pname = "pcsxr"; version = "1.9.94"; # codeplex does not support direct downloading @@ -67,14 +67,14 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${pname}-${version}" cp README \ AUTHORS \ doc/keys.txt \ doc/tweaks.txt \ ChangeLog.df \ ChangeLog \ - "$out/share/doc/${name}" + "$out/share/doc/${pname}-${version}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix index 159eefad6662..619938ba5c64 100644 --- a/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ppsspp/default.nix @@ -5,7 +5,7 @@ assert withGamepads -> (SDL2 != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "ppsspp-${version}"; + pname = "ppsspp"; version = "1.4.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix index 65cc0bd9c05a..ca8d87b38005 100644 --- a/nixpkgs/pkgs/misc/emulators/qmc2/default.nix +++ b/nixpkgs/pkgs/misc/emulators/qmc2/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - name = "qmc2-${version}"; + pname = "qmc2"; version = "0.195"; src = fetchurl { - url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${name}.tar.gz"; + url = "mirror://sourceforge/project/qmc2/qmc2/${version}/${pname}-${version}.tar.gz"; sha256 = "1dzmjlfk8pdspns6zg1jmd5fqzg8igd4q38cz4a1vf39lx74svns"; }; diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix index ee7ff114ec8f..f26769cd28dd 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/default.nix @@ -26,7 +26,7 @@ let }; in stdenv.mkDerivation rec { - name = "retroarch-bare-${version}"; + pname = "retroarch-bare"; version = "1.7.5"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix index 1072a66e0eac..8bdc79f2d8ec 100644 --- a/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix +++ b/nixpkgs/pkgs/misc/emulators/retroarch/kodi-advanced-launchers.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { - name = "kodi-retroarch-advanced-launchers-${version}"; + pname = "kodi-retroarch-advanced-launchers"; version = "0.2"; dontBuild = true; diff --git a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix index 2537669bbc42..25af4f8d50a7 100644 --- a/nixpkgs/pkgs/misc/emulators/retrofe/default.nix +++ b/nixpkgs/pkgs/misc/emulators/retrofe/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "retrofe-${version}"; + pname = "retrofe"; version = "0.6.169"; src = fetchhg { diff --git a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix index 4c44377c11e6..ae1b1bf6bda2 100644 --- a/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix +++ b/nixpkgs/pkgs/misc/emulators/rpcs3/default.nix @@ -10,7 +10,7 @@ let gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in stdenv.mkDerivation rec { - name = "rpcs3-${version}"; + pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchgit { diff --git a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix index a58f95875ccf..0ae92121cab1 100644 --- a/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/nixpkgs/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -2,7 +2,7 @@ , SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: stdenv.mkDerivation rec { - name = "snes9x-gtk-${version}"; + pname = "snes9x-gtk"; version = "1.57"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/misc/emulators/stella/default.nix b/nixpkgs/pkgs/misc/emulators/stella/default.nix index 41ba5a3b2e61..c2d98cda060d 100644 --- a/nixpkgs/pkgs/misc/emulators/stella/default.nix +++ b/nixpkgs/pkgs/misc/emulators/stella/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "stella-${version}"; + pname = "stella"; version = "4.6.1"; src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz"; + url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; diff --git a/nixpkgs/pkgs/misc/emulators/vbam/default.nix b/nixpkgs/pkgs/misc/emulators/vbam/default.nix index c8712d208590..4df9086a317f 100644 --- a/nixpkgs/pkgs/misc/emulators/vbam/default.nix +++ b/nixpkgs/pkgs/misc/emulators/vbam/default.nix @@ -14,7 +14,7 @@ }: stdenv.mkDerivation rec { - name = "visualboyadvance-m-${version}"; + pname = "visualboyadvance-m"; version = "2.1.3"; src = fetchFromGitHub { owner = "visualboyadvance-m"; diff --git a/nixpkgs/pkgs/misc/emulators/yabause/default.nix b/nixpkgs/pkgs/misc/emulators/yabause/default.nix index a2d462fd990e..ed8652d08f1b 100644 --- a/nixpkgs/pkgs/misc/emulators/yabause/default.nix +++ b/nixpkgs/pkgs/misc/emulators/yabause/default.nix @@ -2,11 +2,11 @@ , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${version}"; + pname = "yabause"; version = "0.9.15"; src = fetchurl { - url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz"; sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23"; }; |