From 9ae47f9e64d1f43da5fd7804ac308e76b1ba918b Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 25 Oct 2020 02:20:19 +0200 Subject: [PATCH 1/2] arx-libertatis: remove old override --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8afc133f51b..fa1b5b98a4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24870,9 +24870,7 @@ in arena = callPackage ../games/arena {}; - arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { - stdenv = gcc6Stdenv; - }; + arx-libertatis = libsForQt5.callPackage ../games/arx-libertatis { }; asc = callPackage ../games/asc { lua = lua5_1; From 883006d6bfa63d9f5b0c79a44fe17f2f0111bc8d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 25 Oct 2020 02:37:12 +0200 Subject: [PATCH 2/2] arx-libertatis: 2019-07-22 -> 2020-10-20 --- pkgs/games/arx-libertatis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 8b2cf83e509..52935c96cdb 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation { pname = "arx-libertatis"; - version = "2019-07-22"; + version = "2020-10-20"; src = fetchFromGitHub { owner = "arx"; repo = "ArxLibertatis"; - rev = "db77aa26bb8612f711b65e72b1cd8cf6481700c7"; - sha256 = "0c88djyzjna17wjcvkgsfx3011m1rba5xdzdldy1hjmafpqgb4jj"; + rev = "21df2e37664de79e117eff2af164873f05600f4c"; + sha256 = "06plyyh0ddqv1j04m1vclz9j72609pgrp61v8wfjdcln8djm376i"; }; nativeBuildInputs = [