Merge pull request #173011 from hrdinka/retrofe

retrofe: 0.6.169 -> 0.10.31

authored by

Christoph Hrdinka and committed by
GitHub
4e4e295f 919b1ece

+8 -21
+8 -10
pkgs/applications/emulators/retrofe/default.nix
··· 1 - { lib, stdenv, fetchhg, cmake, glib, gst_all_1, makeWrapper, pkg-config 1 + { lib, stdenv, fetchFromGitHub, cmake, glib, gst_all_1, makeWrapper, pkg-config 2 2 , python2, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib, runtimeShell 3 3 }: 4 4 5 5 stdenv.mkDerivation { 6 6 pname = "retrofe"; 7 - version = "0.6.169"; 7 + version = "0.10.31"; 8 8 9 - src = fetchhg { 10 - url = "https://bitbucket.org/teamretro/retrofe"; 11 - rev = "8793e03"; 12 - sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; 9 + src = fetchFromGitHub { 10 + owner = "phulshof"; 11 + repo = "RetroFE"; 12 + rev = "2ddd65a76210d241031c4ac9268255f311df25d1"; 13 + sha256 = "sha256-uBfECbU2Df/pPpEXXq62S7Ec0YU4lPIsZ8k5UmKD7xQ="; 13 14 }; 14 15 15 16 nativeBuildInputs = [ cmake makeWrapper pkg-config python2 ]; ··· 18 19 glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib 19 20 ] ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ]); 20 21 21 - patches = [ ./include-paths.patch ]; 22 - 23 22 configurePhase = '' 24 23 cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \ 25 24 -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \ 26 - -DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0' 27 25 ''; 28 26 29 27 buildPhase = '' ··· 70 68 71 69 meta = with lib; { 72 70 description = "A frontend for arcade cabinets and media PCs"; 73 - homepage = "http://retrofe.com"; 71 + homepage = "http://retrofe.nl/"; 74 72 license = licenses.gpl3Plus; 75 73 maintainers = with maintainers; [ hrdinka ]; 76 74 platforms = with platforms; linux;
-11
pkgs/applications/emulators/retrofe/include-paths.patch
··· 1 - diff -ur RetroFE.1/RetroFE/Source/CMakeLists.txt RetroFE.2/RetroFE/Source/CMakeLists.txt 2 - --- RetroFE.1/RetroFE/Source/CMakeLists.txt 2016-02-21 14:52:36.726070602 +0100 3 - +++ RetroFE.2/RetroFE/Source/CMakeLists.txt 2016-02-21 14:38:43.036249029 +0100 4 - @@ -59,6 +59,7 @@ 5 - set(RETROFE_INCLUDE_DIRS 6 - "${GLIB2_INCLUDE_DIRS}" 7 - "${GSTREAMER_INCLUDE_DIRS}" 8 - + "${GSTREAMER_BASE_INCLUDE_DIRS}" 9 - "${SDL2_INCLUDE_DIRS}" 10 - "${SDL2_IMAGE_INCLUDE_DIRS}" 11 - "${SDL2_MIXER_INCLUDE_DIRS}"