commit 2ca694f473629e2445e46595b2e2b248c81669de

+10 -4

pkgs/applications/audio/sooperlooper/default.nix

··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , fetchFromGitHub 3 4 , autoreconfHook 4 5 , pkg-config ··· 8 9 , libxml2 9 10 , libjack2 10 11 , libsndfile 11 - , wxGTK30 12 + , wxGTK30-gtk3 12 13 , libsigcxx 13 14 , libsamplerate 14 15 , rubberband ··· 34 35 ./autogen.sh 35 36 ''; 36 37 37 - nativeBuildInputs = [ autoreconfHook pkg-config which libtool ]; 38 + nativeBuildInputs = [ 39 + autoreconfHook 40 + pkg-config 41 + which 42 + libtool 43 + ]; 38 44 39 45 buildInputs = [ 40 46 liblo 41 47 libxml2 42 48 libjack2 43 49 libsndfile 44 - wxGTK30 50 + wxGTK30-gtk3 45 51 libsigcxx 46 52 libsamplerate 47 53 rubberband

+18 -5

pkgs/applications/backup/urbackup-client/default.nix

··· 1 - { stdenv, lib, fetchzip, wxGTK30, zlib, zstd }: 1 + { stdenv 2 + , lib 3 + , fetchzip 4 + , wxGTK32 5 + , zlib 6 + , zstd 7 + }: 2 8 3 9 stdenv.mkDerivation rec { 4 10 pname = "urbackup-client"; 5 - version = "2.4.11"; 11 + version = "2.5.20"; 6 12 7 13 src = fetchzip { 8 14 url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz"; 9 - sha256 = "0cciy9v1pxj9qaklpbhp2d5rdbkmfm74vhpqx6b4phww0f10wvzh"; 15 + sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g="; 10 16 }; 11 17 12 - configureFlags = [ "--enable-embedded-cryptopp" ]; 13 - buildInputs = [ wxGTK30 zlib zstd ]; 18 + buildInputs = [ 19 + wxGTK32 20 + zlib 21 + zstd 22 + ]; 23 + 24 + configureFlags = [ 25 + "--enable-embedded-cryptopp" 26 + ]; 14 27 15 28 meta = with lib; { 16 29 description = "An easy to setup Open Source client/server backup system";

+24 -20

pkgs/applications/emulators/dolphin-emu/default.nix

··· 6 6 , bluez 7 7 , ffmpeg 8 8 , libao 9 - , gtk2 9 + , gtk3 10 10 , glib 11 11 , libGLU 12 12 , libGL ··· 21 21 , fetchFromGitHub 22 22 , libusb1 23 23 , libevdev 24 - , wxGTK30 24 + , wxGTK30-gtk3 25 25 , soundtouch 26 26 , miniupnpc 27 27 , mbedtls ··· 43 43 }; 44 44 45 45 patches = [ 46 - # Fix build with soundtouch 2.1.2 46 + # Fix FTBFS with glibc 2.26 47 47 (fetchpatch { 48 - url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; 49 - name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; 50 - sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; 48 + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/02_glibc-2.26.patch"; 49 + name = "02_glibc-2.26.patch"; 50 + sha256 = "sha256-LBXT3rf5klwmX9YQXt4/iv06GghsWZprNhLGYlKiDqk="; 51 51 }) 52 - # Fix build with gcc 8 52 + # Fix FTBFS with GCC 8 53 53 (fetchpatch { 54 - url = "https://salsa.debian.org/games-team/dolphin-emu/raw/9b7b4aeac1b60dcf28bdcafbed6bc498b2aeb0ad/debian/patches/03_gcc8.patch"; 54 + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/03_gcc8.patch"; 55 55 name = "03_gcc8.patch"; 56 - sha256 = "1da95gb8c95kd5cjhdvg19cv2z863lj3va5gx3bqc7g8r36glqxr"; 56 + sha256 = "sha256-uWP6zMjoHYbX6K+oPSQdBn2xWQpvNyhZabMkhtYrSbU="; 57 + }) 58 + # Fix FTBFS with SoundTouch 2.1.2 59 + (fetchpatch { 60 + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/05_soundtouch-2.1.2.patch"; 61 + name = "05_soundtouch-2.1.2.patch"; 62 + sha256 = "sha256-Y7CNM6GQC9GRhlOBLZlxkIpj1CFhIwA5L8lGXur/bwY="; 63 + }) 64 + # Use GTK+3 wxWidgets backend 65 + (fetchpatch { 66 + url = "https://salsa.debian.org/games-team/dolphin-emu/raw/8c952b1fcd46259e9d8cce836df433e0a8b88f8c/debian/patches/06_gtk3.patch"; 67 + name = "06_gtk3.patch"; 68 + sha256 = "sha256-pu5Q0+8kNwmpf2DoXCXHFqxF0EGTnFXJipkBz1Vh2cs="; 57 69 }) 58 70 ]; 59 71 60 - postPatch = '' 61 - substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ 62 - --replace " CHAR_WIDTH " " CHARWIDTH " 63 - ''; 64 - 65 72 cmakeFlags = [ 66 - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" 67 - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" 68 - "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" 69 73 "-DENABLE_LTO=True" 70 74 ]; 71 75 ··· 80 84 libao 81 85 libGLU 82 86 libGL 83 - gtk2 87 + gtk3 84 88 glib 85 89 gettext 86 90 libpthreadstubs ··· 97 101 portaudio 98 102 libusb1 99 103 libpulseaudio 100 - wxGTK30 104 + wxGTK30-gtk3 101 105 soundtouch 102 106 miniupnpc 103 107 mbedtls ··· 117 121 maintainers = with maintainers; [ MP2E ashkitten ]; 118 122 # x86_32 is an unsupported platform. 119 123 # Enable generic build if you really want a JIT-less binary. 120 - platforms = [ "x86_64-linux" ]; 124 + platforms = [ "x86_64-linux" "aarch64-linux" ]; 121 125 }; 122 126 }

+24 -10

pkgs/applications/misc/flamerobin/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, wxGTK30, boost, firebird }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , cmake 6 + , wxGTK32 7 + , boost 8 + , firebird 9 + }: 2 10 3 11 stdenv.mkDerivation rec { 4 - version = "0.9.3.1"; 12 + version = "0.9.3.12"; 5 13 pname = "flamerobin"; 6 14 7 15 src = fetchFromGitHub { 8 16 owner = "mariuz"; 9 17 repo = "flamerobin"; 10 18 rev = version; 11 - sha256 = "1wwcsca01hpgi9z5flvbdhs9zv7jvahnbn97j6ymy0hdyb8lv6si"; 19 + sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA="; 12 20 }; 13 21 14 - enableParallelBuilding = true; 22 + patches = [ 23 + # rely on compiler command line for __int128 and std::decimal::decimal128 24 + (fetchpatch { 25 + url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch"; 26 + sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM="; 27 + }) 28 + ]; 15 29 16 - buildInputs = [ wxGTK30 boost firebird ]; 30 + enableParallelBuilding = true; 17 31 18 - preBuild = '' 19 - sed -i 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -nostartfiles/' Makefile 20 - ''; 32 + nativeBuildInputs = [ cmake ]; 21 33 22 - configureFlags = [ 23 - "--disable-debug" 34 + buildInputs = [ 35 + wxGTK32 36 + boost 37 + firebird 24 38 ]; 25 39 26 40 meta = with lib; {

+33 -10

pkgs/applications/misc/lenmus/default.nix

··· 1 - { lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch 2 - , cmake, boost 3 - , portmidi, sqlite 4 - , freetype, libpng, pngpp, zlib 5 - , wxGTK30, wxsqlite3 1 + { lib 2 + , stdenv 3 + , pkg-config 4 + , fetchFromGitHub 5 + , fetchpatch 6 + , cmake 7 + , boost 8 + , portmidi 9 + , sqlite 10 + , freetype 11 + , libpng 12 + , pngpp 13 + , zlib 14 + , wxGTK30-gtk3 15 + , wxsqlite3 6 16 }: 7 17 8 18 stdenv.mkDerivation rec { ··· 25 35 url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch"; 26 36 sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn"; 27 37 }) 38 + (fetchpatch { 39 + url = "https://github.com/lenmus/lenmus/commit/37ee8ac9c8faff65a14e8f7ed2bc22e6dc48d91f.patch"; 40 + includes = [ "src/app/lenmus_midi_wizard.cpp" ]; 41 + sha256 = "sha256-nlT6ZbSCIXUk2Ufv/SDn2A0Rt+s/7m+7l9HOoQmaIhc="; 42 + }) 28 43 ]; 29 44 30 - nativeBuildInputs = [ cmake pkg-config ]; 45 + nativeBuildInputs = [ 46 + cmake 47 + pkg-config 48 + ]; 49 + 31 50 buildInputs = [ 32 51 boost 33 - portmidi sqlite 34 - freetype libpng pngpp zlib 35 - wxGTK30 wxsqlite3 52 + portmidi 53 + sqlite 54 + freetype 55 + libpng 56 + pngpp 57 + zlib 58 + wxGTK30-gtk3 59 + wxsqlite3 36 60 ]; 37 61 38 62 meta = with lib; { ··· 46 70 license = licenses.gpl3Plus; 47 71 maintainers = with maintainers; [ ramkromberg ]; 48 72 platforms = with platforms; linux; 49 - broken = stdenv.hostPlatform.isAarch64; 50 73 }; 51 74 }

+1 -1

pkgs/applications/misc/lutris/fhsenv.nix

··· 30 30 # DGen // TODO: libarchive is broken 31 31 32 32 # Dolphin 33 - bluez ffmpeg gettext portaudio wxGTK30 miniupnpc mbedtls lzo sfml gsm 33 + bluez ffmpeg gettext portaudio wxGTK30-gtk3 miniupnpc mbedtls lzo sfml gsm 34 34 wavpack orc nettle gmp pcre vulkan-loader 35 35 36 36 # DOSBox

+40 -9

pkgs/applications/misc/pwsafe/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub 2 - , cmake, pkg-config, zip, gettext, perl 3 - , wxGTK30, libXext, libXi, libXt, libXtst, xercesc 4 - , qrencode, libuuid, libyubikey, yubikey-personalization 5 - , curl, openssl, file, gitUpdater 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , pkg-config 6 + , zip 7 + , gettext 8 + , perl 9 + , wxGTK30-gtk3 10 + , libXext 11 + , libXi 12 + , libXt 13 + , libXtst 14 + , xercesc 15 + , qrencode 16 + , libuuid 17 + , libyubikey 18 + , yubikey-personalization 19 + , curl 20 + , openssl 21 + , file 22 + , gitUpdater 6 23 }: 7 24 8 25 stdenv.mkDerivation rec { ··· 17 34 }; 18 35 19 36 nativeBuildInputs = [ 20 - cmake gettext perl pkg-config zip 37 + cmake 38 + gettext 39 + perl 40 + pkg-config 41 + zip 21 42 ]; 43 + 22 44 buildInputs = [ 23 - libXext libXi libXt libXtst wxGTK30 24 - curl qrencode libuuid openssl xercesc 25 - libyubikey yubikey-personalization 45 + libXext 46 + libXi 47 + libXt 48 + libXtst 49 + wxGTK30-gtk3 50 + curl 51 + qrencode 52 + libuuid 53 + openssl 54 + xercesc 55 + libyubikey 56 + yubikey-personalization 26 57 file 27 58 ]; 28 59

+17 -5

pkgs/applications/misc/xchm/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, chmlib }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , wxGTK32 6 + , chmlib 7 + }: 2 8 3 9 stdenv.mkDerivation rec { 4 10 pname = "xchm"; ··· 11 17 sha256 = "sha256-8HQaXxZQwfBaWc22GivKri1vZEnZ23anSfriCvmLHHw="; 12 18 }; 13 19 14 - nativeBuildInputs = [ autoreconfHook ]; 15 - buildInputs = [ wxGTK30 chmlib ]; 20 + nativeBuildInputs = [ 21 + autoreconfHook 22 + ]; 16 23 17 - configureFlags = [ "--with-wx-prefix=${wxGTK30}" ]; 24 + buildInputs = [ 25 + wxGTK32 26 + chmlib 27 + ]; 28 + 29 + configureFlags = [ "--with-wx-prefix=${wxGTK32}" ]; 18 30 19 31 preConfigure = '' 20 - export LDFLAGS="$LDFLAGS $(${wxGTK30}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk2u_aui-3.0" 32 + export LDFLAGS="$LDFLAGS $(${wxGTK32}/bin/wx-config --libs | sed -e s@-pthread@@) -lwx_gtk3u_aui-3.2" 21 33 ''; 22 34 23 35 meta = with lib; {

+42 -10

pkgs/applications/science/misc/boinc/default.nix

··· 1 - { fetchFromGitHub, lib, stdenv, autoconf, automake, pkg-config, m4, curl, 2 - libGLU, libGL, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK30, xcbutil, 3 - sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: 1 + { fetchFromGitHub 2 + , lib 3 + , stdenv 4 + , autoconf 5 + , automake 6 + , pkg-config 7 + , m4 8 + , curl 9 + , libGLU 10 + , libGL 11 + , libXmu 12 + , libXi 13 + , freeglut 14 + , libjpeg 15 + , libtool 16 + , wxGTK32 17 + , xcbutil 18 + , sqlite 19 + , gtk3 20 + , patchelf 21 + , libXScrnSaver 22 + , libnotify 23 + , libX11 24 + , libxcb 25 + }: 4 26 5 27 let 6 28 majorVersion = "7.20"; ··· 22 44 nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; 23 45 24 46 buildInputs = [ 25 - curl libGLU libGL libXmu libXi freeglut libjpeg wxGTK30 sqlite gtk2 libXScrnSaver 26 - libnotify patchelf libX11 libxcb xcbutil 47 + curl 48 + libGLU 49 + libGL 50 + libXmu 51 + libXi 52 + freeglut 53 + libjpeg 54 + wxGTK32 55 + sqlite 56 + gtk3 57 + libXScrnSaver 58 + libnotify 59 + patchelf 60 + libX11 61 + libxcb 62 + xcbutil 27 63 ]; 28 64 29 65 NIX_LDFLAGS = "-lX11"; ··· 45 81 description = "Free software for distributed and grid computing"; 46 82 homepage = "https://boinc.berkeley.edu/"; 47 83 license = licenses.lgpl2Plus; 48 - platforms = platforms.linux; # arbitrary choice 49 - # checking for gcc options needed to detect all undeclared functions... cannot detect 50 - # configure: error: in `/build/boinc-7.18.1-src': 51 - # configure: error: cannot make gcc report undeclared builtins 52 - broken = stdenv.isAarch64; 84 + platforms = platforms.linux; 53 85 maintainers = with maintainers; [ Luflosi ]; 54 86 }; 55 87 }

+25 -4

pkgs/applications/science/misc/fityk/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, boost, lua, zlib, bzip2 2 - , xylib, readline, gnuplot, swig3 }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , wxGTK32 6 + , boost 7 + , lua 8 + , zlib 9 + , bzip2 10 + , xylib 11 + , readline 12 + , gnuplot 13 + , swig3 14 + }: 3 15 4 16 stdenv.mkDerivation rec { 5 17 pname = "fityk"; ··· 13 25 }; 14 26 15 27 nativeBuildInputs = [ autoreconfHook ]; 16 - buildInputs = [ wxGTK30 boost lua zlib bzip2 xylib readline 17 - gnuplot swig3 ]; 28 + buildInputs = [ 29 + wxGTK32 30 + boost 31 + lua 32 + zlib 33 + bzip2 34 + xylib 35 + readline 36 + gnuplot 37 + swig3 38 + ]; 18 39 19 40 NIX_CFLAGS_COMPILE = [ 20 41 "-std=c++11"

+14 -2

pkgs/development/libraries/xylib/default.nix

··· 1 - { lib, stdenv, fetchurl, boost, zlib, bzip2, wxGTK30 }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , boost 5 + , zlib 6 + , bzip2 7 + , wxGTK32 8 + }: 2 9 3 10 stdenv.mkDerivation rec { 4 11 pname = "xylib"; ··· 9 16 sha256 = "1iqfrfrk78mki5csxysw86zm35ag71w0jvim0f12nwq1z8rwnhdn"; 10 17 }; 11 18 12 - buildInputs = [ boost zlib bzip2 wxGTK30 ]; 19 + buildInputs = [ 20 + boost 21 + zlib 22 + bzip2 23 + wxGTK32 24 + ]; 13 25 14 26 meta = with lib; { 15 27 description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods";

+37 -5

pkgs/games/odamex/default.nix

··· 1 - { lib, stdenv, cmake, fetchurl, pkg-config, SDL, SDL_mixer, SDL_net, wxGTK30 }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , cmake 5 + , pkg-config 6 + , makeWrapper 7 + , SDL 8 + , SDL_mixer 9 + , SDL_net 10 + , wxGTK32 11 + }: 2 12 3 13 stdenv.mkDerivation rec { 4 14 pname = "odamex"; ··· 9 19 sha256 = "sha256-WBqO5fWzemw1kYlY192v0nnZkbIEVuWmjWYMy+1ODPQ="; 10 20 }; 11 21 12 - nativeBuildInputs = [ cmake pkg-config ]; 13 - buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ]; 22 + nativeBuildInputs = [ 23 + cmake 24 + pkg-config 25 + makeWrapper 26 + ]; 27 + 28 + buildInputs = [ 29 + SDL 30 + SDL_mixer 31 + SDL_net 32 + wxGTK32 33 + ]; 34 + 35 + installPhase = '' 36 + runHook preInstall 37 + '' + (if stdenv.isDarwin then '' 38 + mkdir -p $out/{Applications,bin} 39 + mv odalaunch/odalaunch.app $out/Applications 40 + makeWrapper $out/{Applications/odalaunch.app/Contents/MacOS,bin}/odalaunch 41 + '' else '' 42 + make install 43 + '') + '' 44 + runHook postInstall 45 + ''; 14 46 15 47 meta = { 16 48 homepage = "http://odamex.net/"; 17 49 description = "A client/server port for playing old-school Doom online"; 18 - license = lib.licenses.gpl2; 19 - platforms = lib.platforms.linux; 50 + license = lib.licenses.gpl2Only; 51 + platforms = lib.platforms.unix; 20 52 maintainers = with lib.maintainers; [ MP2E ]; 21 53 }; 22 54 }

+58 -14

pkgs/games/spring/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, cmake, xz, boost, libdevil, zlib, p7zip 2 - , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU, libGL 3 - , asciidoc, docbook_xsl, docbook_xsl_ns, curl, makeWrapper 4 - , jdk ? null, python ? null, systemd, libunwind, which, minizip 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , cmake 5 + , xz 6 + , boost 7 + , libdevil 8 + , zlib 9 + , p7zip 10 + , openal 11 + , libvorbis 12 + , glew 13 + , freetype 14 + , xorg 15 + , SDL2 16 + , libGLU 17 + , libGL 18 + , asciidoc 19 + , docbook_xsl 20 + , docbook_xsl_ns 21 + , curl 22 + , makeWrapper 23 + , jdk 24 + , python 25 + , systemd 26 + , libunwind 27 + , which 28 + , minizip 5 29 , withAI ? true # support for AI Interfaces and Skirmish AIs 6 30 }: 7 31 ··· 36 60 echo "${version} maintenance" > VERSION 37 61 ''; 38 62 39 - cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" 40 - "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" 41 - "-DPREFER_STATIC_LIBS:BOOL=OFF"]; 63 + cmakeFlags = [ 64 + "-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" 65 + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON" 66 + "-DPREFER_STATIC_LIBS:BOOL=OFF" 67 + ]; 42 68 43 69 nativeBuildInputs = [ cmake makeWrapper docbook_xsl docbook_xsl_ns asciidoc ]; 44 - buildInputs = [ xz boost libdevil zlib p7zip openal libvorbis freetype SDL2 45 - xorg.libX11 xorg.libXcursor libGLU libGL glew curl 46 - systemd libunwind which minizip ] 47 - ++ lib.optional withAI jdk 48 - ++ lib.optional withAI python; 70 + buildInputs = [ 71 + xz 72 + boost 73 + libdevil 74 + zlib 75 + p7zip 76 + openal 77 + libvorbis 78 + freetype 79 + SDL2 80 + xorg.libX11 81 + xorg.libXcursor 82 + libGLU 83 + libGL 84 + glew 85 + curl 86 + systemd 87 + libunwind 88 + which 89 + minizip 90 + ] 91 + ++ lib.optional withAI jdk 92 + ++ lib.optional withAI python; 49 93 50 94 NIX_CFLAGS_COMPILE = "-fpermissive"; # GL header minor incompatibility 51 95 ··· 57 101 meta = with lib; { 58 102 homepage = "https://springrts.com/"; 59 103 description = "A powerful real-time strategy (RTS) game engine"; 60 - license = licenses.gpl2; 104 + license = licenses.gpl2Plus; 61 105 maintainers = with maintainers; [ qknight domenkozar sorki ]; 62 - platforms = platforms.linux; 106 + platforms = [ "i686-linux" "x86_64-linux" ]; 63 107 }; 64 108 }

+42 -8

pkgs/games/spring/springlobby.nix

··· 1 - { lib, stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkg-config, curl, libtorrent-rasterbar 2 - , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring 3 - , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , fetchpatch 5 + , cmake 6 + , wxGTK30 7 + , openal 8 + , pkg-config 9 + , curl 10 + , libtorrent-rasterbar 11 + , libpng 12 + , libX11 13 + , gettext 14 + , boost 15 + , libnotify 16 + , gtk2 17 + , doxygen 18 + , spring 19 + , makeWrapper 20 + , glib 21 + , minizip 22 + , alure 23 + , pcre 24 + , jsoncpp 25 + }: 4 26 5 27 stdenv.mkDerivation rec { 6 28 pname = "springlobby"; ··· 13 35 14 36 nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ]; 15 37 buildInputs = [ 16 - wxGTK30 openal curl libtorrent-rasterbar pcre jsoncpp 17 - boost libpng libX11 libnotify gtk2 glib minizip alure 38 + wxGTK30 39 + openal 40 + curl 41 + libtorrent-rasterbar 42 + pcre 43 + jsoncpp 44 + boost 45 + libpng 46 + libX11 47 + libnotify 48 + gtk2 49 + glib 50 + minizip 51 + alure 18 52 ]; 19 53 20 54 patches = [ ··· 33 67 ''; 34 68 35 69 meta = with lib; { 36 - homepage = "https://springlobby.info/"; 70 + homepage = "https://springlobby.springrts.com"; 37 71 description = "Cross-platform lobby client for the Spring RTS project"; 38 - license = licenses.gpl2; 72 + license = licenses.gpl2Plus; 39 73 maintainers = with maintainers; [ qknight domenkozar ]; 40 - platforms = platforms.linux; 74 + platforms = [ "i686-linux" "x86_64-linux" ]; 41 75 }; 42 76 }

+34 -5

pkgs/misc/screensavers/electricsheep/default.nix

··· 1 - { lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl 2 - , libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL 3 - , glee }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , wxGTK32 6 + , ffmpeg 7 + , lua5_1 8 + , curl 9 + , libpng 10 + , xorg 11 + , pkg-config 12 + , flam3 13 + , libgtop 14 + , boost 15 + , tinyxml 16 + , freeglut 17 + , libGLU 18 + , libGL 19 + , glee 20 + }: 4 21 5 22 stdenv.mkDerivation rec { 6 23 pname = "electricsheep"; ··· 16 33 nativeBuildInputs = [ autoreconfHook pkg-config ]; 17 34 18 35 buildInputs = [ 19 - wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender 20 - flam3 libgtop boost tinyxml freeglut libGLU libGL glee 36 + wxGTK32 37 + ffmpeg 38 + lua5_1 39 + curl 40 + libpng 41 + xorg.libXrender 42 + flam3 43 + libgtop 44 + boost 45 + tinyxml 46 + freeglut 47 + libGLU 48 + libGL 49 + glee 21 50 ]; 22 51 23 52 preAutoreconf = ''