diff --git a/pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch b/pkgs/applications/emulators/bsnes/ares/000-dont-rebuild-on-install.patch similarity index 100% rename from pkgs/applications/emulators/bsnes/ares/dont-rebuild-on-install.patch rename to pkgs/applications/emulators/bsnes/ares/000-dont-rebuild-on-install.patch diff --git a/pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch b/pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch new file mode 100644 index 000000000000..86f548389259 --- /dev/null +++ b/pkgs/applications/emulators/bsnes/ares/001-fix-ruby.patch @@ -0,0 +1,24 @@ +diff -Naur source-old/ruby/GNUmakefile source-new/ruby/GNUmakefile +--- source-old/ruby/GNUmakefile 1969-12-31 21:00:01.000000000 -0300 ++++ source-new/ruby/GNUmakefile 2022-11-13 22:43:09.700197748 -0300 +@@ -11,17 +11,9 @@ + ruby += audio.openal + ruby += input.quartz #input.carbon + else ifeq ($(platform),linux) +- pkg_check = $(if $(shell pkg-config $1 && echo 1),$2) +- ruby += video.glx video.glx2 video.xshm +- ruby += $(call pkg_check,xv,video.xvideo) +- ruby += audio.oss audio.alsa +- ruby += $(call pkg_check,openal,audio.openal) +- ruby += $(call pkg_check,libpulse,audio.pulseaudio) +- ruby += $(call pkg_check,libpulse-simple,audio.pulseaudiosimple) +- ruby += $(call pkg_check,ao,audio.ao) +- ruby += input.xlib +- ruby += $(call pkg_check,libudev,input.udev) +- ruby += $(call pkg_check,sdl2,input.sdl) ++ ruby += video.glx video.glx2 video.xshm video.xvideo ++ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao ++ ruby += input.xlib input.udev input.sdl + else ifeq ($(platform),bsd) + pkg_check = $(if $(shell pkg-config $1 && echo 1),$2) + ruby += video.glx video.glx2 video.xshm diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 9935e51740a1..7a6dae5784ce 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -17,20 +17,20 @@ , udev }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "129"; + version = "130.1"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; - rev = "v${version}"; - hash = "sha256-prfvoGtbnsl/1ahx98jBOgT64W566GoUtE8rIOF7lYc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-q2wDpbNaDyKPBL20FDaHScKQEJYstlQdJ4CzbRoSPlk="; }; patches = [ - ./dont-rebuild-on-install.patch - ./fix-ruby.patch + ./000-dont-rebuild-on-install.patch + ./001-fix-ruby.patch ]; nativeBuildInputs = [ @@ -64,12 +64,12 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://ares.dev"; + homepage = "https://ares-emu.net"; description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = licenses.isc; maintainers = with maintainers; [ Madouura AndersonTorres ]; platforms = platforms.linux; }; -} +}) # TODO: select between Qt, GTK2 and GTK3 # TODO: support Darwin diff --git a/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch b/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch deleted file mode 100644 index 01bd57ebaadd..000000000000 --- a/pkgs/applications/emulators/bsnes/ares/fix-ruby.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile -index e85a51701..7fca89e0f 100644 ---- a/ruby/GNUmakefile -+++ b/ruby/GNUmakefile -@@ -8,19 +8,9 @@ ifeq ($(ruby),) - ruby += audio.openal - ruby += input.quartz #input.carbon - else ifeq ($(platform),linux) -- pkg_check1 = $(if $(shell test -e /usr/lib/lib$1.so && echo 1),$2) -- pkg_check2 = $(if $(shell test -e /usr/lib/$(shell uname -m)-linux-gnu/lib$1.so && echo 1),$2) -- pkg_check = $(call pkg_check1,$1,$2) $(call pkg_check2,$1,$2) -- ruby += video.glx video.glx2 video.xshm -- ruby += $(call pkg_check,Xv,video.xvideo) -- ruby += audio.oss audio.alsa -- ruby += $(call pkg_check,openal,audio.openal) -- ruby += $(call pkg_check,pulse,audio.pulseaudio) -- ruby += $(call pkg_check,pulse-simple,audio.pulseaudiosimple) -- ruby += $(call pkg_check,ao,audio.ao) -- ruby += input.xlib -- ruby += $(call pkg_check,udev,input.udev) -- ruby += $(call pkg_check,SDL2,input.sdl) -+ ruby += video.glx video.glx2 video.xshm video.xvideo -+ ruby += audio.oss audio.alsa audio.openal audio.pulseaudio audio.pulseaudiosimple audio.ao -+ ruby += input.xlib input.udev input.sdl - else ifeq ($(platform),bsd) - pkg_check = $(if $(shell test -e /usr/local/lib/lib$1.so && echo 1),$2) - ruby += video.glx video.glx2 video.xshm diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 49cb2498e64f..5472069f4168 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -21,15 +21,15 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "desmume"; - version = "0.9.11+unstable=2021-09-22"; + version = "0.9.13"; src = fetchFromGitHub { owner = "TASVideos"; - repo = pname; - rev = "7fc2e4b6b6a58420de65a4089d4df3934d7a46b1"; - hash = "sha256-sTCyjQ31w1Lp+aa3VQ7/rdLbhjnqthce54mjKJZQIDM="; + repo = "desmume"; + rev = "release_${lib.replaceChars ["."] ["_"] finalAttrs.version}"; + hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; }; nativeBuildInputs = [ @@ -81,7 +81,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed }; -} +}) # TODO: investigate the patches # TODO: investigate other platforms diff --git a/pkgs/applications/emulators/fceux/default.nix b/pkgs/applications/emulators/fceux/default.nix index e48f1cf7d56c..0225f76a2aaf 100644 --- a/pkgs/applications/emulators/fceux/default.nix +++ b/pkgs/applications/emulators/fceux/default.nix @@ -1,24 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, SDL2, lua5_1, minizip, x264 }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, cmake +, lua +, minizip +, pkg-config +, wrapQtAppsHook +, x264 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fceux"; version = "2.6.4"; src = fetchFromGitHub { owner = "TASEmulators"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM="; + repo = "fceux"; + rev = "fceux-${finalAttrs.version}"; + hash = "sha256-Q6r/iBlmi0z40+U6OLZCahS0io4IBBGZMP1mJH7szRM="; }; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ SDL2 lua5_1 minizip x264 ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + SDL2 + lua + minizip + x264 + ]; meta = with lib; { + homepage = "http://www.fceux.com/"; description = "A Nintendo Entertainment System (NES) Emulator"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sbruder scubed2 ]; - homepage = "http://www.fceux.com/"; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/file-managers/doublecmd/default.nix b/pkgs/applications/file-managers/doublecmd/default.nix index f9f0dcde2816..46e8e96f2acb 100644 --- a/pkgs/applications/file-managers/doublecmd/default.nix +++ b/pkgs/applications/file-managers/doublecmd/default.nix @@ -11,14 +11,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; version = "1.0.8"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-kuqleoDoxzOj3baTK0lBJpbDECoHeFubWhLXAVkEqAk="; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libqt5pas ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}"; postPatch = '' patchShebangs build.sh install/linux/install.sh @@ -70,5 +70,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; }; -} +}) # TODO: deal with other platforms too diff --git a/pkgs/development/compilers/asl/default.nix b/pkgs/development/compilers/asl/default.nix index cfc44c717e08..b8c900a20b3c 100644 --- a/pkgs/development/compilers/asl/default.nix +++ b/pkgs/development/compilers/asl/default.nix @@ -1,19 +1,22 @@ { lib , stdenv , fetchzip -, buildDocs ? false, tex +, tex +, buildDocs ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "asl"; - version = "142-bld211"; + version = "142-bld232"; - src = fetchzip { + src = let inherit (finalAttrs) pname version; in fetchzip { name = "${pname}-${version}"; url = "http://john.ccac.rwth-aachen.de:8000/ftp/as/source/c_version/asl-current-${version}.tar.bz2"; - hash = "sha256-Sbm16JX7kC/7Ws7YgNBUXNqOCl6u+RXgfNjTODhCzSM="; + hash = "sha256-Q50GzXBxFMhbt5s9OgHPNH4bdqz2hhEmTnMmKowVn2E="; }; + outputs = [ "out" "doc" "man" ]; + nativeBuildInputs = lib.optionals buildDocs [ tex ]; postPatch = lib.optionalString (!buildDocs) '' @@ -26,10 +29,10 @@ stdenv.mkDerivation rec { preBuild = '' bindir="${placeholder "out"}/bin" \ - docdir="${placeholder "out"}/doc/asl" \ + docdir="${placeholder "doc"}/share/doc/asl" \ incdir="${placeholder "out"}/include/asl" \ libdir="${placeholder "out"}/lib/asl" \ - mandir="${placeholder "out"}/share/man" \ + mandir="${placeholder "man"}/share/man" \ substituteAll ${./Makefile-nixos.def} Makefile.def mkdir -p .objdir ''; @@ -47,8 +50,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} -# TODO: multiple outputs +}) # TODO: cross-compilation support # TODO: customize TeX input # TODO: report upstream about `mkdir -p .objdir/` diff --git a/pkgs/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix index 3cbea01be8a7..0abc2206b01c 100644 --- a/pkgs/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -1,22 +1,23 @@ { lib , stdenv , fetchurl +, libtool , ncurses -, withLibrary ? false, libtool +, withLibrary ? false , unicodeSupport ? true , enableShared ? !stdenv.isDarwin }: assert withLibrary -> libtool != null; -assert unicodeSupport -> ncurses.unicodeSupport && ncurses != null; +assert unicodeSupport -> ncurses != null && ncurses.unicodeSupport; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dialog"; - version = "1.3-20211214"; + version = "1.3-20220728"; src = fetchurl { - url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-zCll4FxqjDcHCza1ZBTqpWDfjYfyzqIXWeKJUOmyeks="; + url = "ftp://ftp.invisible-island.net/dialog/dialog-${finalAttrs.version}.tgz"; + hash = "sha256-VEGJc9VZpGGwBpX6/mjfYvK8c9UGtDaCHXfKPfRUGQs="; }; buildInputs = [ @@ -25,9 +26,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-rpath-hacks" - (lib.withFeature withLibrary "libtool") - "--with-ncurses${lib.optionalString unicodeSupport "w"}" + "--${if withLibrary then "with" else "without"}-libtool" "--with-libtool-opts=${lib.optionalString enableShared "-shared"}" + "--with-ncurses${lib.optionalString unicodeSupport "w"}" ]; installTargets = [ @@ -41,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres spacefrogg ]; inherit (ncurses.meta) platforms; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b12df22622cf..e22c11fa37ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1557,7 +1557,10 @@ with pkgs; emulationstation = callPackage ../applications/emulators/emulationstation { }; - fceux = libsForQt5.callPackage ../applications/emulators/fceux { }; + fceux = callPackage ../applications/emulators/fceux { + lua = lua5_1; + inherit (libsForQt5) wrapQtAppsHook; + }; firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };