pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #215860 from atorres1985-contrib/small-fixups

authored by

Anderson Torres and committed by
GitHub e11d514b d7d2e66e

+33 -29
unified split
+28 -24
pkgs/applications/emulators/dosbox-staging/default.nix
··· 1 - { alsa-lib 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , SDL2 5 + , SDL2_image 6 + , SDL2_net 7 + , alsa-lib 2 8 , copyDesktopItems 3 - , fetchFromGitHub 4 9 , fluidsynth 5 10 , glib 6 11 , gtest 7 - , lib 12 + , irr1 8 13 , libGL 9 14 , libGLU 10 15 , libjack2 ··· 20 25 , ninja 21 26 , opusfile 22 27 , pkg-config 23 - , irr1 24 - , SDL2 25 - , SDL2_image 26 - , SDL2_net 27 28 , speexdsp 28 - , stdenv 29 29 }: 30 30 31 - stdenv.mkDerivation rec { 31 + stdenv.mkDerivation (self: { 32 32 pname = "dosbox-staging"; 33 33 version = "0.80.1"; 34 34 35 35 src = fetchFromGitHub { 36 - owner = pname; 37 - repo = pname; 38 - rev = "v${version}"; 36 + owner = "dosbox-staging"; 37 + repo = "dosbox-staging"; 38 + rev = "v${self.version}"; 39 39 hash = "sha256-I90poBeLSq1c8PXyjrx7/UcbfqFNnnNiXfJdWhLPGMc="; 40 40 }; 41 41 ··· 49 49 ]; 50 50 51 51 buildInputs = [ 52 + SDL2 53 + SDL2_image 54 + SDL2_net 52 55 alsa-lib 53 56 fluidsynth 54 57 glib ··· 63 66 libslirp 64 67 libsndfile 65 68 opusfile 66 - SDL2 67 - SDL2_image 68 - SDL2_net 69 69 speexdsp 70 70 ]; 71 71 ··· 91 91 # original dosbox. Doing it this way allows us to work with frontends and 92 92 # launchers that expect the binary to be named dosbox, but get out of the 93 93 # way of vanilla dosbox if the user desires to install that as well. 94 - mv $out/bin/dosbox $out/bin/${pname} 94 + mv $out/bin/dosbox $out/bin/${self.pname} 95 95 makeWrapper $out/bin/dosbox-staging $out/bin/dosbox 96 96 97 97 # Create a symlink to dosbox manual instead of merely copying it 98 98 pushd $out/share/man/man1/ 99 - mv dosbox.1.gz ${pname}.1.gz 100 - ln -s ${pname}.1.gz dosbox.1.gz 99 + mv dosbox.1.gz ${self.pname}.1.gz 100 + ln -s ${self.pname}.1.gz dosbox.1.gz 101 101 popd 102 102 ''; 103 103 104 - meta = with lib; { 104 + meta = { 105 105 homepage = "https://dosbox-staging.github.io/"; 106 106 description = "A modernized DOS emulator"; 107 107 longDescription = '' ··· 110 110 existing DOSBox codebase while leveraging modern development tools and 111 111 practices. 112 112 ''; 113 - license = licenses.gpl2Plus; 114 - maintainers = with maintainers; [ joshuafern AndersonTorres ]; 115 - platforms = platforms.unix; 113 + changelog = "https://github.com/dosbox-staging/dosbox-staging/releases/tag/v${self.version}"; 114 + license = lib.licenses.gpl2Plus; 115 + maintainers = [ 116 + lib.maintainers.joshuafern 117 + lib.maintainers.AndersonTorres 118 + ]; 119 + platforms = lib.platforms.unix; 116 120 priority = 101; 117 121 }; 118 - } 119 - # TODO: report upstream about not finding SDL2_net 122 + }) 123 + # TODO: report upstream about not finding extra SDL2 libraries
+5 -5
pkgs/development/libraries/irr1/default.nix
··· 4 4 , cmake 5 5 }: 6 6 7 - stdenv.mkDerivation rec { 7 + stdenv.mkDerivation (self: { 8 8 pname = "irr1"; 9 9 version = "1.9.4"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "berndporr"; 13 13 repo = "iir1"; 14 - rev = version; 14 + rev = self.version; 15 15 hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; 16 16 }; 17 17 18 18 nativeBuildInputs = [ cmake ]; 19 19 20 20 meta = { 21 - description = "A DSP IIR realtime filter library written in C++"; 22 - downloadPage = "https://github.com/berndporr/iir1"; 23 21 homepage = "http://berndporr.github.io/iir1/"; 22 + description = "A DSP IIR realtime filter library written in C++"; 23 + changelog = "https://github.com/berndporr/iir1/releases/tag/${self.version}"; 24 24 license = lib.licenses.mit; 25 25 maintainers = [ lib.maintainers.AndersonTorres ]; 26 26 platforms = lib.platforms.unix; 27 27 }; 28 - } 28 + })