diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-19 14:53:29 +0100 |
| commit | 5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4 (patch) | |
| tree | c59afebc263ebb1693ae8c154164e5625c30ee76 /pkgs/games | |
| parent | 801d3b51f0ed2da1745c87eec8da2035d7dd5fb7 (diff) | |
| parent | f6b39f852e0a9eb35a7434f02e5579c15519c41c (diff) | |
| download | nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.gz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.bz2 nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.lz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.xz nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.tar.zst nixpkgs-5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/arx-libertatis/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/gcs/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/games/steam/chrootenv.nix | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index d3f18d4c218..354787e0f07 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation { '' + optionalString withCrashReporter '' wrapQtApp "$out/libexec/arxcrashreporter" ''; - + meta = { description = '' A cross-platform, open source port of Arx Fatalis, a 2002 first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = http://arx-libertatis.org/; + homepage = https://arx-libertatis.org/; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index 3665467407a..f1230b739bb 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { cd ../toolkit ant - + cd ../gcs ant @@ -60,15 +60,15 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/java find gcs/libraries toolkit/libraries apple_stubs/ \( -name '*.jar' -and -not -name '*-src.jar' \) -exec cp '{}' $out/share/java ';' - + makeWrapper ${jre8}/bin/java $out/bin/gcs \ --set GCS_LIBRARY ${library} \ --add-flags "-cp $out/share/java/gcs-${version}.jar com.trollworks.gcs.app.GCS" - ''; + ''; meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = http://gurpscharactersheet.com/; + homepage = https://gurpscharactersheet.com/; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 0de961e6d49..3be1f522974 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -75,7 +75,7 @@ in buildFHSUserEnv rec { xorg.libX11 xorg.libXfixes libGL - libva + pkgsi686Linux.libva # Not formally in runtime but needed by some games at-spi2-atk |