diff options
Diffstat (limited to 'pkgs/misc')
42 files changed, 172 insertions, 136 deletions
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 1f8e559b415..d005f6becad 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ] ++ optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 38cfb75fa09..114568fdd52 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -91,8 +91,8 @@ stdenv.mkDerivation rec { sha256 = "0ryy946h7ddmxh866hfszqfyff1qy4svpsk7w3739v75f4awr9li"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig gtk2 libxml2 libtool diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 60516190355..ce95ca00e11 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,46 +1,41 @@ { stdenv, fetchurl, cups }: -let - version = "1.6.12"; -in - stdenv.mkDerivation { - - name = "epson-escpr-${version}"; - - src = fetchurl { - - url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz"; - sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda"; - }; - - patches = [ ./cups-filter-ppd-dirs.patch ]; - - buildInputs = [ cups ]; - - meta = with stdenv.lib; { - homepage = http://download.ebz.epson.net/dsc/search/01/search/; - description = "ESC/P-R Driver (generic driver)"; - longDescription = '' - Epson Inkjet Printer Driver (ESC/P-R) for Linux and the - corresponding PPD files. The list of supported printers - can be found at http://www.openprinting.org/driver/epson-escpr/ . - - To use the driver adjust your configuration.nix file: - services.printing = { - enable = true; - drivers = [ pkgs.epson-escpr ]; - }; - - To setup a wireless printer, enable Avahi which provides - printer's hostname to CUPS and nss-mdns to make this - hostname resolvable: - services.avahi = { - enable = true; - nssmdns = true; - };''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; - - } +stdenv.mkDerivation rec { + name = "epson-escpr-${version}"; + version = "1.6.16"; + + src = fetchurl { + url = "https://download3.ebz.epson.net/dsc/f/03/00/06/41/54/29588ed107f800e5bc3f91706661567efb369c1c/epson-inkjet-printer-escpr-1.6.16-1lsb3.2.tar.gz"; + sha256 = "0v9mcih3dg3ws18hdcgm014k97hv6imga39hy2a84gnc6badp6n6"; + }; + + patches = [ ./cups-filter-ppd-dirs.patch ]; + + buildInputs = [ cups ]; + + meta = with stdenv.lib; { + homepage = "http://download.ebz.epson.net/dsc/search/01/search/"; + description = "ESC/P-R Driver (generic driver)"; + longDescription = '' + Epson Inkjet Printer Driver (ESC/P-R) for Linux and the + corresponding PPD files. The list of supported printers + can be found at http://www.openprinting.org/driver/epson-escpr/ . + + To use the driver adjust your configuration.nix file: + services.printing = { + enable = true; + drivers = [ pkgs.epson-escpr ]; + }; + + To setup a wireless printer, enable Avahi which provides + printer's hostname to CUPS and nss-mdns to make this + hostname resolvable: + services.avahi = { + enable = true; + nssmdns = true; + };''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index bdba1eb7b81..799b14dec1d 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - buildInputs = [ pkgconfig perl cups dbus enscript ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ perl cups dbus enscript ]; preConfigure = '' diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 4e0b609fdb0..ffb2052ca0c 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -15,7 +15,8 @@ in stdenv.mkDerivation { substituteInPlace Makefile --replace /usr/local "$out" ''; - buildInputs = [ scons libX11 pkgconfig libusb1 boost glib dbus_glib]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ scons libX11 libusb1 boost glib dbus_glib]; meta = with stdenv.lib; { homepage = http://pingus.seul.org/~grumbel/xboxdrv/; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index 9cf70db471c..4fff6f6b8c1 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - buildInputs = [ udev ncurses pkgconfig bluez ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ncurses bluez ]; configureFlags = "--with-doxygen=no"; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index cc9d11f8643..e587151d3e7 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,5 +32,6 @@ in stdenv.mkDerivation ({ homepage = http://cdemu.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 7ec83959e38..d03b18f12d6 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; licenses = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index f606e352a7b..8025cf766f0 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ca36d16072d..41dbfd1999c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gcc cmake bluez ffmpeg libao mesa gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libevdev libXdmcp portaudio libusb libpulseaudio ]; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index 95d03c425e3..a17dd6a775e 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL SDL_net SDL_sound libpng mesa autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ SDL SDL_net SDL_sound libpng mesa ]; desktopItem = makeDesktopItem { name = "dosbox"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 9f33305ae14..b700b22807c 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0cm0sq2wri2l9cvab1l0g02za59q7klj0h3p028vr96n6njj4w9v"; }; - buildInputs = [ pkgconfig cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 42469c5daf4..ce8f8e030e3 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -8,8 +8,9 @@ stdenv.mkDerivation { sha256 = "1qg5bygla8ka30b7wqvq6dv84xc7pq0jspffh2jz75d1njyi2kc0"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - scons zlib SDL lua5_1 pkgconfig + scons zlib SDL lua5_1 ]; phases = "unpackPhase buildPhase"; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 172b2a2eb3e..8b2409b74c3 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; }; - buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 34507a25252..bfe43403bc6 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index a03695eed77..1172a89caf3 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,36 +1,42 @@ -{ stdenv, fetchurl, pkgconfig -, libX11, mesa, freeglut -, libjack2, libcdio, libsndfile, libsamplerate -, SDL, SDL_net, zlib -}: +{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +, libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: -with stdenv.lib; stdenv.mkDerivation rec { - name = "mednafen-${version}"; - version = "0.9.47"; + version = "0.9.48"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${name}.tar.xz"; - sha256 = "0flz6bjkzs9qrw923s4cpqrz4b2dhc2w7pd8mgw0l1xbmrh7w4si"; + sha256 = "00i12mywhp43274aq466fwavglk5b7d8z8bfdna12ra9iy1hrk6k"; }; - buildInputs = - [ pkgconfig libX11 mesa freeglut libjack2 libcdio - libsndfile libsamplerate SDL SDL_net zlib ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + freeglut + mesa + libcdio + libjack2 + libsamplerate + libsndfile + libX11 + SDL + SDL_net + zlib + ]; + + hardeningDisable = [ "pic" ]; - # Install docs postInstall = '' - mkdir -p $out/share/doc/$name - cd Documentation - install -m 644 -t $out/share/doc/$name *.css *.def *.html *.php *.png *.txt + mkdir -p $out/share/doc + mv Documentation $out/share/doc/mednafen ''; meta = with stdenv.lib; { description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix index 91a74171da9..75eeeea4c00 100644 --- a/pkgs/misc/emulators/mednafen/server.nix +++ b/pkgs/misc/emulators/mednafen/server.nix @@ -1,25 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mednafen-server-${version}"; version = "0.5.2"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-0.5.2.tar.xz"; + url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; }; - postInstall = '' - mkdir -p $out/share/$name - install -m 644 -t $out/share/$name standard.conf - ''; + postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; meta = with stdenv.lib; { description = "Netplay server for Mednafen"; - homepage = http://mednafen.github.io/; + homepage = https://mednafen.github.io/; license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index ea35ee8ac54..7de9b576ef3 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw"; }; - buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ boost dash freetype libpng SDL which zlib ]; buildPhase = '' dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus" diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 171453b89d5..5e5ce9edca4 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - buildInputs = [ pkgconfig ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index be872250d03..41ba5a3b2e6 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; }; - buildInputs = [ pkgconfig SDL2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ SDL2 ]; meta = { description = "An open-source Atari 2600 VCS emulator"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ca1881bdd5f..318993d08b6 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 9fb90875b97..64bb8b4e356 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional cairoSupport pkgs.cairo ++ lib.optional tiffSupport pkgs.libtiff ++ lib.optional odbcSupport pkgs.unixODBC - ++ lib.optional netapiSupport pkgs.samba3_light + ++ lib.optional netapiSupport pkgs.samba4 ++ lib.optional cursesSupport pkgs.ncurses ++ lib.optional vaSupport pkgs.libva-full ++ lib.optional pcapSupport pkgs.libpcap @@ -109,6 +109,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { homepage = http://www.winehq.org/; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; + maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; }; }) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index aaaec67c751..fb384aee746 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.17"; + version = "2.18"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "0sgazjn30ki2y3bjrd0xbpf870ii22wkyrmgaxcwbk23j1rrbp3y"; + sha256 = "0l2gmk6g4c5ds29iqcvpmh5g8jdz6g6id7xkgiqps5bqk09322cz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "11jm39g1kc77fvn02j9g8syyc095b6w2jashyr28v4gi7g0fqv6h"; + sha256 = "02rh2lvx7sd8d6nhgpfq9crjh495k4k7i3wmgigs4m5rlip363s8"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index 23d91040b12..fb99421a61a 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,35 +1,33 @@ -{ stdenv, fetchurl, config -, cmake, pkgconfig -, doxygen -, qt -, libXmu, mesa, openal, SDL2, freeglut -}: +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa +, freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { - name = "yabause-${meta.version}"; + name = "yabause-${version}"; + # 0.9.15 only works with OpenGL 3.2 or later: + # https://github.com/Yabause/yabause/issues/349 + version = "0.9.14"; src = fetchurl { - url = "http://download.tuxfamily.org/yabause/releases/${meta.version}/${name}.tar.gz"; + url = "https://download.tuxfamily.org/yabause/releases/${version}/${name}.tar.gz"; sha256 = "0nkpvnr599g0i2mf19sjvw5m0rrvixdgz2snav4qwvzgfc435rkm"; }; - patches = [ ./linkage-rwx-linux-elf.diff ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qtbase mesa freeglut openal SDL2 ]; - buildInputs = - [ cmake pkgconfig doxygen qt libXmu mesa openal SDL2 freeglut ]; + patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; - cmakeConfigureFlags = [ - "-DYAB_PORTS='qt'" - "-DYAB_OPTIMIZED_DMA='ON'" - "-DYAB_NETWORK='ON'" ] ; + cmakeFlags = [ + "-DYAB_NETWORK=ON" + "-DYAB_OPTIMIZED_DMA=ON" + "-DYAB_PORTS=qt" + ] ; meta = with stdenv.lib; { - version = "0.9.14"; description = "An open-source Sega Saturn emulator"; - homepage = http://yabause.org/; + homepage = https://yabause.org/; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; }; } -# TODO: Qt5 diff --git a/pkgs/misc/emulators/yabause/emu-compatibility.com.patch b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch new file mode 100644 index 00000000000..5f13d2ee183 --- /dev/null +++ b/pkgs/misc/emulators/yabause/emu-compatibility.com.patch @@ -0,0 +1,10 @@ +--- a/src/qt/ui/UIYabause.ui 2017-09-28 13:23:04.636014753 +0000 ++++ b/src/qt/ui/UIYabause.ui 2017-09-28 13:23:21.945763537 +0000 +@@ -230,7 +230,6 @@ + <property name="title"> + <string>&Help</string> + </property> +- <addaction name="aHelpEmuCompatibility"/> + <addaction name="aHelpAbout"/> + </widget> + <widget class="QMenu" name="mTools"> diff --git a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch index bb0491b373f..bb0491b373f 100644 --- a/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.diff +++ b/pkgs/misc/emulators/yabause/linkage-rwx-linux-elf.patch diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index aec79f1c5cf..2d210ca0098 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -6,7 +6,8 @@ packageOverrides = pkgs : with pkgs; { sdlEnv = pkgs.myEnvFun { name = "sdl"; - buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net pkgconfig]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ stdenv SDL SDL_image SDL_ttf SDL_gfx cmake SDL_net]; }; }; } diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 36593794ed7..25441a30d86 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha256 = "147cr4aw1kw4gv3bhn0cska855kmyah8m70vdw1q2lwz56lbf4mb"; }; - buildInputs = [ pkgconfig jansson libsailing ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ jansson libsailing ]; INSTALL_PATH = "$(out)"; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index f05073469b7..1dc03e1e9f0 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -20,8 +20,9 @@ stdenv.mkDerivation rec { "--enable-imlib2" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig autoreconfHook libX11 + autoreconfHook libX11 pam libgcrypt libXrender imlib2 ]; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index b13e9c7866c..a0dac519a0b 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { # Patch so that systemd is "found" when configuring. patches = [ ./systemd.patch ]; - buildInputs = [ which xfce.xfce4_dev_tools glib systemd pkgconfig + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which xfce.xfce4_dev_tools glib systemd libX11 libXScrnSaver libXxf86misc gtk3 dbus_glib wrapGAppsHook ]; preConfigure = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 25994ba3562..7b280d770b3 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1aikafjqrfmv23jnrrm5d56dg6injh4l67zjdxzdapv9chw7g3cg"; }; - buildInputs = [ pkgconfig mesa xlibsWrapper imagemagick libtiff bzip2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index 7aada471145..500f7a9c5a3 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r"; }; - buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cmake docutils glib libpthreadstubs libXau libXdmcp xcbutil ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index e5b6bf0d167..a278e6dc949 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; }; - buildInputs = [ glib pkgconfig xorg.libX11 xorg.libXScrnSaver dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib xorg.libX11 xorg.libXScrnSaver dbus ]; makeFlags = [ "bindir=$(out)/bin" diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 887c179c59d..1aa1f347ab4 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation { sha256 = "1z2wlhi5d05b18pvwz146kp0lkcc6z2mnilk01mk19hzbziyqmsc"; }; - buildInputs = [ python pkgconfig xlibsWrapper pam ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python xlibsWrapper pam ]; configurePhase = '' substituteInPlace .config/options.py --replace /usr/include/security/pam_appl.h ${pam}/include/security/pam_appl.h diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 6ce337855d9..d302fbe6d4b 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec sha256 = "03zvxk25311xgn383k54qvvpr8xbnl1vxd99fg4ca9yg5rmir1q6"; }; - buildInputs = [ which automake autoconf pkgconfig libtool vala_0_23 python intltool fuse ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ which automake autoconf libtool vala_0_23 python intltool fuse ]; propagatedBuildInputs = [ ccnet curl ]; preConfigure = '' diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 114e18dc93f..4fef8d08043 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -14,7 +14,8 @@ in stdenv.mkDerivation rec { sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; - buildInputs = [ pkgconfig python pygtk gettext texinfo + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ python pygtk gettext texinfo ghostscript librsvg gdk_pixbuf txt2man makeWrapper ]; diff --git a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix index 81609eff55a..4ec5b5da0a4 100644 --- a/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engine-murrine/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "129cs5bqw23i76h3nmc29c9mqkm9460iwc8vkl7hs4xr07h8mip9"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "A very flexible theme engine"; diff --git a/pkgs/misc/themes/gtk2/gtk-engines/default.nix b/pkgs/misc/themes/gtk2/gtk-engines/default.nix index e64b13f9305..966190a5e76 100644 --- a/pkgs/misc/themes/gtk2/gtk-engines/default.nix +++ b/pkgs/misc/themes/gtk2/gtk-engines/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "1db65pb0j0mijmswrvpgkdabilqd23x22d95hp5kwxvcramq1dhm"; }; - buildInputs = [ pkgconfig intltool gtk2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ intltool gtk2 ]; meta = { description = "Theme engines for GTK+ 2"; diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/materia-theme/default.nix index cd652440efa..755a0b737ca 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/materia-theme/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, gnome3, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "flat-plat-gtk-theme-${version}"; - version = "20170917"; + name = "materia-theme-${version}"; + version = "20171005"; src = fetchFromGitHub { owner = "nana-4"; - repo = "Flat-Plat"; + repo = "materia-theme"; rev = "v${version}"; - sha256 = "17r4wl27yx49xg0l3s5d67174r63p4cw6cbdmzl81if7iab69hv0"; + sha256 = "0znm7mx2nv2sgvy8fyams1ckp1ly3nbbs0k09d24w1zzd90xhzqp"; }; nativeBuildInputs = [ gnome3.glib libxml2 ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Material Design-like theme for GTK+ based desktop environments"; - homepage = https://github.com/nana-4/Flat-Plat; + description = "A Material Design-like theme for GNOME/GTK+ based desktop environments (formerly Flat-Plat)"; + homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.mounium ]; diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix index 4e1963536a8..233a73df868 100644 --- a/pkgs/misc/themes/numix/default.nix +++ b/pkgs/misc/themes/numix/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2017-07-26"; + version = "2.6.7"; name = "numix-gtk-theme-${version}"; src = fetchFromGitHub { repo = "numix-gtk-theme"; owner = "numixproject"; - rev = "858e6292c4336302be4d499c9b085a891b4c3b40"; - sha256 = "1z9l13px79yk42874dlh8z6p7chlngwarfnki89win3g2xvclz8q"; + rev = version; + sha256 = "1fmlc6vi8prvwsq0nxxcd00lp04bwmapzjqf727wb1czqf2lf0dv"; }; nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index e3d6d40bdac..125df39ae8a 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "urbit-${version}"; - version = "0.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "urbit"; repo = "urbit"; rev = "v${version}"; - sha256 = "1ndy58ypilabf9pfkqzzl7wf6x1vr4gpvsbn30sygp2ip908q0xz"; + sha256 = "1zgxgqbz74nsgfyrvsnjj6xxpb64mrnby7bb5qy733sy04gmzgik"; }; buildInputs = with stdenv.lib; [ diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index b659266ace7..23749fd4ce6 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -373,8 +373,10 @@ rec { } ''; - addRtp = path: derivation: - derivation // { rtp = "${derivation}/${path}"; }; + addRtp = path: attrs: derivation: + derivation // { rtp = "${derivation}/${path}"; } // { + overrideAttrs = f: buildVimPlugin (attrs // f attrs); + }; buildVimPlugin = a@{ name, @@ -389,7 +391,7 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // { name = namePrefix + name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; |