diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 6ee2a1511261..b73fb71f698f 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -1,45 +1,33 @@ -{ lib, stdenv +{ lib +, stdenv , mkDerivation , fetchFromGitHub , fetchpatch -, substituteAll -, gdal +, clipper , cmake +, cups +, doxygen +, gdal , ninja , proj -, clipper -, zlib -, qttools +, qtimageformats , qtlocation , qtsensors +, qttools , qttranslations -, doxygen -, cups -, qtimageformats +, substituteAll +, zlib }: mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = "0.9.5"; - buildInputs = [ - gdal - qtlocation - qtimageformats - qtsensors - clipper - zlib - proj - cups - ]; - - nativeBuildInputs = [ cmake doxygen ninja qttools ]; - src = fetchFromGitHub { owner = "OpenOrienteering"; repo = "mapper"; rev = "v${version}"; - sha256 = "1w8ikqpgi0ksrzjal5ihfaik4grc5v3gdnnv79j20xkr2p4yn1h5"; + hash = "sha256-BQbryRV5diBkOtva9sYuLD8yo3IwFqrkz3qC+C6eEfE="; }; patches = [ @@ -55,6 +43,24 @@ mkDerivation rec { }) ]; + nativeBuildInputs = [ + cmake + doxygen + ninja + qttools + ]; + + buildInputs = [ + clipper + cups + gdal + proj + qtimageformats + qtlocation + qtsensors + zlib + ]; + cmakeFlags = [ # Building the manual and bundling licenses fails # See https://github.com/NixOS/nixpkgs/issues/85306 @@ -81,15 +87,12 @@ mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; - description = '' - OpenOrienteering Mapper is an orienteering mapmaking program - and provides a free alternative to the existing proprietary solution. - ''; homepage = "https://www.openorienteering.org/apps/mapper/"; + description = "An orienteering mapmaking program"; changelog = "https://github.com/OpenOrienteering/mapper/releases/tag/v${version}"; license = licenses.gpl3Plus; - platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ mpickering sikmir ]; + platforms = with platforms; unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/gis/udig/default.nix b/pkgs/applications/gis/udig/default.nix index e4abddbcde00..b939cf05e754 100644 --- a/pkgs/applications/gis/udig/default.nix +++ b/pkgs/applications/gis/udig/default.nix @@ -6,11 +6,11 @@ let srcs = { x86_64-linux = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.linux.gtk.x86_64.zip"; - sha256 = "03hj1mdd6sq0gbpa838wkccibp3l2hvnwxxf5dyc0jk3mmd94fwa"; + hash = "sha256-ijuSWq1jSsB8K653bjcUdNwVGZscDaTuegBr01oNEg4="; }; x86_64-darwin = fetchurl { url = "http://udig.refractions.net/files/downloads/udig-${version}.macosx.cocoa.x86_64.zip"; - sha256 = "16rcyp1zy3lr1hwjhzh6vwcgck52w66dm1qsc52gppy1f4i3f692"; + hash = "sha256-Ihk3InHB3/tEYRqH2ozhokz2GN8Gfig5DJkO/8P1LJs="; }; }; src = srcs.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index c60523e3e996..fc4648eb9dce 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: + rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; version = "2.0.0"; @@ -7,20 +13,22 @@ rustPlatform.buildRustPackage rec { owner = "jblindsay"; repo = "whitebox-tools"; rev = "7551aa70e8d9cbd8b3744fde48e82aa40393ebf8"; - sha256 = "0mngw99aj60bf02y3piimxc1z1zbw1dhwyixndxh3b3m9xqhk51h"; + hash = "sha256-MJQJcU91rAF7sz16Dlvg64cfWK8x3uEFcAsYqVLiz1Y="; }; - cargoPatches = [./update-cargo-lock.patch]; + cargoSha256 = "sha256-+IFLv/mIgqyDKNC5aZgQeW6Ymu6+desOD8dDvEdwsSM="; + + cargoPatches = [ + ./update-cargo-lock.patch + ]; buildInputs = lib.optional stdenv.isDarwin Security; - cargoSha256 = "08xif13vqhy71w7fnxdyxsd9hvkr22c6kffh521sr0l8z6zlp0gq"; - doCheck = false; meta = with lib; { - description = "An advanced geospatial data analysis platform"; homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; + description = "An advanced geospatial data analysis platform"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; }; diff --git a/pkgs/desktops/gnome/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix index 95ec0699db73..e9331c08993c 100644 --- a/pkgs/desktops/gnome/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667 (fetchpatch { url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655"; - sha256 = "sha256:0ihixyq72yhx6njij7bldsqb80x3y217yh6livknlf5r1wr3hakn"; + sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY="; extraPrefix = ""; name = "gnome-todo_meson-build.patch"; }) diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix index fd8935594696..d1cadd04be05 100644 --- a/pkgs/games/bugdom/default.nix +++ b/pkgs/games/bugdom/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256:1371inw11rzfrxmc3v4gv5axp56bxjbcr0mhqm4x839401bfq5mf"; + sha256 = "sha256-rhbsVgAkDdRJxbCCzJbsy5TbVdmP7MFqz+7nELiN4Yw="; fetchSubmodules = true; }; diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 49a91e7a64d4..b493f4dcfa27 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -1,39 +1,49 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchurl +}: + stdenv.mkDerivation rec { pname = "fairymax"; version = "4.8"; + src = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax4_8w.c"; - sha256 = "01vxhpa4z0613mkgkzmsln293wxmyp5kdzil93cd1ik51q4gwjca"; + hash = "sha256-ikn+CA5lxtDYSDT+Nsv1tfORhKW6/vlmHcGAT9SFfQc="; }; + ini = fetchurl { url = "http://home.hccnet.nl/h.g.muller/fmax.ini"; - sha256 = "1zwx70g3gspbqx1zf9gm1may8jrli9idalvskxbdg33qgjys47cn"; + hash = "sha256-lh2ivXx4jNdWn3pT1WKKNEvkVQ31JfdDx+vqNx44nf8="; }; + unpackPhase = '' cp ${src} fairymax.c cp ${ini} fmax.ini ''; + buildPhase = '' - $CC *.c -Wno-return-type -o fairymax -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' + cc *.c -Wno-return-type \ + -o fairymax \ + -DINI_FILE='"'"$out/share/fairymax/fmax.ini"'"' ''; + installPhase = '' mkdir -p "$out"/{bin,share/fairymax} cp fairymax "$out/bin" cp fmax.ini "$out/share/fairymax" ''; - meta = { + + meta = with lib; { + homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; description = "A small chess engine supporting fairy pieces"; longDescription = '' - A version of micro-Max that reads the piece description - from a file fmax.ini, so that arbitrary fairy pieces can be - implemented. This version (4.8J) supports up to 15 piece types, - and board sizes up to 12x8. A Linux port exists in the - format of a debian package. + A version of micro-Max that reads the piece description from a file + fmax.ini, so that arbitrary fairy pieces can be implemented. This version + (4.8J) supports up to 15 piece types, and board sizes up to 12x8. ''; - license = lib.licenses.free ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.all; - homepage = "http://home.hccnet.nl/h.g.muller/dwnldpage.html"; + license = licenses.free; + maintainers = [ maintainers.raskin ]; + platforms = platforms.all; }; } diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index c3479f6758af..4b674ac129df 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -1,8 +1,12 @@ -{ lib, buildPythonApplication, fetchFromGitHub -, gtk3, gobject-introspection -, wrapGAppsHook, python3Packages }: +{ lib +, fetchFromGitHub +, gobject-introspection +, gtk3 +, python3 +, wrapGAppsHook +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "gshogi"; version = "0.5.1"; @@ -10,7 +14,7 @@ buildPythonApplication rec { owner = "johncheetham"; repo = "gshogi"; rev = "v${version}"; - sha256 = "06vgndfgwyfi50wg3cw92zspc9z0k7xn2pp6qsjih0l5yih8iwqh"; + hash = "sha256-EPOIYPSFAhilxuZeYfuZ4Cd29ReJs/E4KNF5/lyzbxs="; }; doCheck = false; # no tests available @@ -22,15 +26,15 @@ buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; meta = with lib; { - description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; homepage = "http://johncheetham.com/projects/gshogi/"; - license = licenses.gpl3; + description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.ciil ]; }; diff --git a/pkgs/games/julius/default.nix b/pkgs/games/julius/default.nix index 84970d110550..df1ff2bd1a06 100644 --- a/pkgs/games/julius/default.nix +++ b/pkgs/games/julius/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, libpng }: +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, SDL2_mixer +, cmake +, libpng +}: stdenv.mkDerivation rec { pname = "julius"; @@ -8,18 +15,18 @@ stdenv.mkDerivation rec { owner = "bvschaik"; repo = "julius"; rev = "v${version}"; - sha256 = "0w7kmgz9ya0ck9cxhsyralarg7y6ydx4plmh33r4mkxkamlr7493"; + hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 SDL2_mixer libpng ]; meta = with lib; { - description = "An open source re-implementation of Caesar III"; homepage = "https://github.com/bvschaik/julius"; + description = "An open source re-implementation of Caesar III"; license = licenses.agpl3; + maintainers = with maintainers; [ Thra11 ]; platforms = platforms.all; broken = stdenv.isDarwin; - maintainers = with maintainers; [ Thra11 ]; }; } diff --git a/pkgs/games/koules/default.nix b/pkgs/games/koules/default.nix index e2c7c55cbb70..360415dc2e1d 100644 --- a/pkgs/games/koules/default.nix +++ b/pkgs/games/koules/default.nix @@ -2,29 +2,28 @@ , lib , fetchurl , fetchzip -, makeDesktopItem , copyDesktopItems -, imake , gccmakedep +, imake +, installShellFiles , libX11 , libXext -, installShellFiles +, makeDesktopItem }: let debian-extras = fetchzip { url = "mirror://debian/pool/main/k/koules/koules_1.4-27.debian.tar.xz"; - sha256 = "0bq1rr6vxqmx2k0dhyrqnwwfiw4h2ycbj576v66vwr0jaq5plil3"; + hash = "sha256-g0Z6C1YSZL6N2eYUuZgXkPDoOLc4e9jAFL3ivk3OAS8="; }; in - stdenv.mkDerivation rec { pname = "koules"; version = "1.4"; src = fetchurl { url = "https://www.ucw.cz/~hubicka/koules/packages/${pname}${version}-src.tar.gz"; - sha256 = "06x2wkpns14kii9fxmxbmj5lma371qj00hgl7fc5kggfmzz96vy3"; + hash = "sha256-w2+T/q/uvVmYO/RBACQOZ6hKi6yr1+5SjJMEbe/kohs="; }; nativeBuildInputs = [ imake gccmakedep installShellFiles copyDesktopItems ]; @@ -57,20 +56,22 @@ stdenv.mkDerivation rec { runHook postInstall ''; - desktopItems = [ (makeDesktopItem { - desktopName = "Koules"; - name = "koules"; - exec = "xkoules"; - icon = "koules"; - comment = "Push your enemies away, but stay away from obstacles"; - categories = [ "Game" "ArcadeGame" ]; - }) ]; + desktopItems = [ + (makeDesktopItem { + desktopName = "Koules"; + name = "koules"; + exec = "xkoules"; + icon = "koules"; + comment = "Push your enemies away, but stay away from obstacles"; + categories = [ "Game" "ArcadeGame" ]; + }) + ]; meta = with lib; { - description = "Fast arcade game based on the fundamental law of body attraction"; homepage = "https://www.ucw.cz/~hubicka/koules/English/"; + description = "Fast arcade game based on the fundamental law of body attraction"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = [ maintainers.iblech ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index 13b423832e67..e7b6c7934188 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost -, opencl-headers, ocl-icd, qtbase , zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, opencl-headers +, ocl-icd +, qtbase +, zlib +}: stdenv.mkDerivation rec { pname = "leela-zero"; @@ -9,7 +17,7 @@ stdenv.mkDerivation rec { owner = "gcp"; repo = "leela-zero"; rev = "v${version}"; - sha256 = "1k04ld1ysabxb8ivci3ji5by9vb3yvnflkf2fscs1x0bp7d6j101"; + sha256 = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; fetchSubmodules = true; }; @@ -21,9 +29,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Go engine modeled after AlphaGo Zero"; - homepage = "https://github.com/gcp/leela-zero"; - license = licenses.gpl3; + homepage = "https://github.com/gcp/leela-zero"; + license = licenses.gpl3Plus; maintainers = [ maintainers.averelld maintainers.omnipotententity ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index bb44d9eee0b6..2f7405725ab9 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -1,6 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages }: +{ stdenv +, lib +, fetchFromGitHub +, python3 +}: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; version = "0.6.1"; @@ -8,15 +12,18 @@ python3Packages.buildPythonApplication rec { owner = "OpenTTD"; repo = "nml"; rev = version; - sha256 = "0z0n4lqvnqigfjjhmmz7mvis7iivd4a8d287ya2yscfg5hznnqh2"; + hash = "sha256-AmJrPyzPMe2F8geJhhRpO8aj467n1wqldC9iuzElFnw="; }; - propagatedBuildInputs = with python3Packages; [ply pillow]; + propagatedBuildInputs = with python3.pkgs; [ + pillow + ply + ]; meta = with lib; { + homepage = "http://openttdcoop.org/"; description = "Compiler for OpenTTD NML files"; - homepage = "http://openttdcoop.org/"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ ToxicFrog ]; }; } diff --git a/pkgs/games/otto-matic/default.nix b/pkgs/games/otto-matic/default.nix index 5dd7f98e4569..2257b50e0c8d 100644 --- a/pkgs/games/otto-matic/default.nix +++ b/pkgs/games/otto-matic/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256:1yd4clks7kr2hn69c4q1ykc92sw6axbspambm03viapr834bjz3q"; + sha256 = "sha256-eHy5yED5qrgHqKuqq1dXhmuR2PQBE5aMhSLPoydlpPk="; fetchSubmodules = true; }; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index c4af373cdcdd..10ce4dd06fcd 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,32 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext -, glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, ffmpeg, portaudio, libepoxy +{ lib +, stdenv +, fetchFromGitHub +, SDL2 +, boost +, cmake +, ffmpeg +, gettext +, glew +, glibmm +, libepoxy +, librsvg +, libxmlxx +, pango +, pkg-config +, portaudio }: stdenv.mkDerivation rec { pname = "performous"; version = "1.1"; - meta = with lib; { - description = "Karaoke, band and dancing game"; - homepage = "http://performous.org/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - src = fetchFromGitHub { owner = "performous"; repo = "performous"; rev = version; - sha256 = "08j0qhr65l7qnd5vxl4l07523qpvdwi31h4vzl3lfiinx1zcgr4x"; + hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI="; }; patches = [ ./performous-cmake.patch ]; - nativeBuildInputs = [ cmake pkg-config gettext ]; + nativeBuildInputs = [ + cmake + gettext + pkg-config + ]; buildInputs = [ - glibmm libxmlxx pango librsvg - SDL2 glew boost ffmpeg portaudio libepoxy + SDL2 + boost + ffmpeg + glew + glibmm + libepoxy + librsvg + libxmlxx + pango + portaudio ]; + + meta = with lib; { + homepage = "http://performous.org/"; + description = "Karaoke, band and dancing game"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; } diff --git a/pkgs/games/tworld2/default.nix b/pkgs/games/tworld2/default.nix index 1db1dcf5f065..158d494fb32d 100644 --- a/pkgs/games/tworld2/default.nix +++ b/pkgs/games/tworld2/default.nix @@ -1,8 +1,8 @@ { stdenv , lib , fetchurl -, qt4 , SDL +, qt4 }: stdenv.mkDerivation rec { @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://tw2.bitbusters.club/downloads/tworld-${version}-src.tar.gz"; - sha256 = "sha256:1y55v2shk2xxcds7bdwdjaq9lka31sgdp2469zqnvldchwbvcb2i"; + hash = "sha256-USy2F4es0W3xT4aI254OQ02asJKNt3V0Y72LCbXYpfg="; }; - buildInputs = [ qt4 SDL ]; + buildInputs = [ SDL qt4 ]; + enableParallelBuilding = true; postConfigure = '' @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge"; homepage = "https://tw2.bitbusters.club/"; + description = "Tile World 2: Tile World is a reimplementation of the game Chip's Challenge"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = with maintainers; [ drperceptron ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 191d8c218070..574c639ad125 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,8 +1,34 @@ -{ lib, stdenv, fetchzip, fetchFromGitHub, buildFHSUserEnv, makeDesktopItem -, copyDesktopItems, gcc, cmake, gmp , libGL, zlib, ncurses, geoip, lua5 -, nettle, curl, SDL2, freetype, glew , openal, libopus, opusfile, libogg -, libvorbis, libjpeg, libwebp, libpng -, cacert, aria2 # to download assets +{ lib +, stdenv +, fetchzip +, fetchFromGitHub +, SDL2 +, buildFHSUserEnv +, cmake +, copyDesktopItems +, curl +, freetype +, gcc +, geoip +, glew +, gmp +, libGL +, libjpeg +, libogg +, libopus +, libpng +, libvorbis +, libwebp +, lua5 +, makeDesktopItem +, ncurses +, nettle +, openal +, opusfile +, zlib +# to download assets +, aria2 +, cacert }: let @@ -14,18 +40,21 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1fiqn9f6nsh4cfjy7gfsv950hphwi9ca0ddgsjvn77g7yc0arp6c"; + sha256 = "sha256-zNysAPPnnWO31K81oFiKHF4IStraveOlYwRqa1yyOLo="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { # DISCLAIMER: this is selected binary crap from the NaCl SDK name = "unvanquished-binary-deps"; version = binary-deps-version; + src = fetchzip { url = "https://dl.unvanquished.net/deps/linux64-${version}.tar.bz2"; - sha256 = "08bpyavbh5lmyprvqqi59gnm8s1fjmlk9f1785wlv7f52d9f9z1p"; + sha256 = "sha256-N/zkUhPFnU15QSe4NGmVLmhU7UslYrzz9ZUWuLbydyE="; }; + dontPatchELF = true; + preFixup = '' # We are not using the autoPatchelfHook, because it would make # nacl_bootstrap_helper unable to load nacl_loader: @@ -38,7 +67,12 @@ let fi done ''; - preCheck = "pnacl/bin/clang -v"; # check it links correctly + + preCheck = '' + # check it links correctly + pnacl/bin/clang -v + ''; + installPhase = '' runHook preInstall @@ -51,15 +85,18 @@ let libstdcpp-preload-for-unvanquished-nacl = stdenv.mkDerivation { name = "libstdcpp-preload-for-unvanquished-nacl"; + + propagatedBuildInputs = [ gcc.cc.lib ]; + buildCommand = '' mkdir $out/etc -p echo ${gcc.cc.lib}/lib/libstdc++.so.6 > $out/etc/ld-nix.so.preload ''; - propagatedBuildInputs = [ gcc.cc.lib ]; }; fhsEnv = buildFHSUserEnv { name = "unvanquished-fhs-wrapper"; + targetPkgs = pkgs: [ libstdcpp-preload-for-unvanquished-nacl ]; }; @@ -81,10 +118,14 @@ let pname = "unvanquished-assets"; inherit version src; - outputHash = "sha256:084jdisb48xyk9agjifn0nlnsdnjgg32si8zd1khsywd0kffplzx"; + outputHash = "sha256-/dPr3ASNew1naB9FLcZ70jZtqQXWRflUmr4jsnRskiA="; outputHashMode = "recursive"; + nativeBuildInputs = [ aria2 cacert ]; - buildCommand = "bash $src/download-paks --cache=$(pwd) --version=${version} $out"; + + buildCommand = '' + bash $src/download-paks --cache=$(pwd) --version=${version} $out + ''; }; # this really is the daemon game engine, the game itself is in the assets @@ -98,7 +139,12 @@ in stdenv.mkDerivation rec { chmod +w -R daemon/external_deps/linux64-${binary-deps-version}/ ''; - nativeBuildInputs = [ cmake unvanquished-binary-deps copyDesktopItems ]; + nativeBuildInputs = [ + cmake + unvanquished-binary-deps + copyDesktopItems + ]; + buildInputs = [ gmp libGL @@ -168,17 +214,18 @@ in stdenv.mkDerivation rec { runHook postInstall ''; + meta = { - platforms = [ "x86_64-linux" ]; homepage = "https://unvanquished.net/"; downloadPage = "https://unvanquished.net/download/"; description = "A fast paced, first person strategy game"; - maintainers = with lib.maintainers; [ afontain ]; # don't replace the following lib.licenses.zlib with just "zlib", # or you would end up with the package instead license = with lib.licenses; [ mit gpl3Plus lib.licenses.zlib bsd3 # engine cc-by-sa-25 cc-by-sa-30 cc-by-30 cc-by-sa-40 cc0 # assets ]; + maintainers = with lib.maintainers; [ afontain ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 765f21465805..82c157104439 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -1,14 +1,25 @@ -{lib, stdenv, fetchurl, SDL, SDL_image, SDL_mixer}: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_image +, SDL_mixer +}: stdenv.mkDerivation rec { pname = "vectoroids"; version = "1.1.0"; + src = fetchurl { url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-${version}.tar.gz"; sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d"; }; - buildInputs = [ SDL SDL_image SDL_mixer]; + buildInputs = [ + SDL + SDL_image + SDL_mixer + ]; preConfigure = '' sed -i s,/usr/local,$out, Makefile diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index e38dedbb7f73..c7687f89589d 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +}: stdenv.mkDerivation { pname = "sqlite-zandronum"; @@ -6,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.sqlite.org/2017/sqlite-autoconf-3180000.tar.gz"; - sha256 = "0p5cx7nbjxk7glcm277ypi5w4gv144qazw79ql47svlpccj62mrp"; + hash = "sha256-N1dhJGOXbn0IxenwrzAhYT/CS7z+HFEZfWd2uezprFw="; }; buildPhase = '' diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index e688b908e126..d18eb144292f 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchzip, cmake, zlib }: +{ lib +, stdenv +, fetchzip +, cmake +, zlib +}: stdenv.mkDerivation rec { pname = "zdbsp"; @@ -6,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; - sha256 = "1j6k0appgjjj3ffbll9hy9nnbqr17szd1s66q08zrbkfqf6g8f0d"; + sha256 = "sha256-DTj0jMNurvwRwMbo0L4+IeNlbfIwUbqcG1LKd68C08g="; stripRoot = false; }; @@ -23,8 +28,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "ZDoom's internal node builder for DOOM maps"; homepage = "https://zdoom.org/wiki/ZDBSP"; + description = "ZDoom's internal node builder for DOOM maps"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus siraben ]; platforms = platforms.unix; diff --git a/pkgs/games/zoom/default.nix b/pkgs/games/zoom/default.nix index 02cfc28ebeef..e281caee72a2 100644 --- a/pkgs/games/zoom/default.nix +++ b/pkgs/games/zoom/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, perl, expat, xlibsWrapper, freetype }: +{ lib +, stdenv +, fetchurl +, perl +, expat +, xlibsWrapper +, freetype +}: # !!! assert freetype == xorg.freetype @@ -8,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.logicalshift.co.uk/unix/zoom/zoom-${version}.tar.gz"; - sha256 = "1g6van7f7sg3zfcz80mncnnbccyg2hnm0hq4x558vpsm0lf7z5pj"; + hash = "sha256-8pZ/HAVV341K6QRDUC0UzzO2rGW2AvSZ++Pp445V27w="; }; buildInputs = [ perl expat xlibsWrapper freetype ]; @@ -16,6 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2 -fgnu89-inline"; meta = with lib; { + homepage = "https://www.logicalshift.co.uk/unix/zoom/"; description = "Player for Z-Code, TADS and HUGO stories or games"; longDescription = '' Zoom is a player for Z-Code, TADS and HUGO stories or games. These are