diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix index a242b5e6af42..680e0b6ecc61 100644 --- a/pkgs/by-name/sa/sameboy/package.nix +++ b/pkgs/by-name/sa/sameboy/package.nix @@ -11,15 +11,15 @@ pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sameboy"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "LIJI32"; repo = "SameBoy"; - rev = "v${version}"; - sha256 = "sha256-rNP1jGnGqZG5jz8vQzqDNEKticg51uCcZQaUteawlPU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Sk5/Wojl9rFkTuBFSGN/W8oq8OJNrV5W3E8PdsaMll8="; }; enableParallelBuilding = true; @@ -45,14 +45,13 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace OpenDialog/gtk.c \ - --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' + --replace-fail '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"' ''; - meta = with lib; { + meta = { homepage = "https://sameboy.github.io"; description = "Game Boy, Game Boy Color, and Super Game Boy emulator"; mainProgram = "sameboy"; - longDescription = '' SameBoy is a user friendly Game Boy, Game Boy Color and Super Game Boy emulator for macOS, Windows and Unix-like platforms. @@ -62,9 +61,8 @@ stdenv.mkDerivation rec { capabilities, SameBoy has all the features one would expect from an emulator – from save states to scaling filters. ''; - - license = licenses.mit; - maintainers = with maintainers; [ NieDzejkob ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ NieDzejkob ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff index 91e09f5fa12e..d367c618b873 100644 --- a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff +++ b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff @@ -1,8 +1,6 @@ -diff --git a/Makefile b/Makefile -index 3377b3f..4492f96 100644 --- a/Makefile +++ b/Makefile -@@ -788,15 +788,7 @@ install: $(BIN)/XdgThumbnailer/sameboy-thumbnailer sdl $(shell find FreeDesktop) +@@ -796,15 +796,7 @@ install -m 755 $(BIN)/SDL/sameboy $(DESTDIR)$(PREFIX)/bin/sameboy install -m 755 $(BIN)/XdgThumbnailer/sameboy-thumbnailer $(DESTDIR)$(PREFIX)/bin/sameboy-thumbnailer install -m 644 XdgThumbnailer/sameboy.thumbnailer $(DESTDIR)$(PREFIX)/share/thumbnailers/sameboy.thumbnailer @@ -16,14 +14,14 @@ index 3377b3f..4492f96 100644 - done -else + - install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/sameboy.xml + install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/packages/sameboy.xml install -m 644 FreeDesktop/sameboy.desktop $(DESTDIR)$(PREFIX)/share/applications/sameboy.desktop for size in 16x16 32x32 64x64 128x128 256x256 512x512; do \ -@@ -807,7 +799,6 @@ else +@@ -815,7 +807,6 @@ install -m 644 FreeDesktop/ColorCartridge/$$size.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/$$size/mimetypes/x-gameboy-color-rom.png; \ done endif -endif - + ios: bootroms @$(MAKE) _ios