openttd{,-jgrpp,-grfcodec,nml}: move to pkgs/by-name
this shouldn't create any rebuilds
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
fetchFromGitHub,
|
||||
openttd,
|
||||
zstd,
|
||||
...
|
||||
}:
|
||||
|
||||
openttd.overrideAttrs (oldAttrs: rec {
|
||||
@@ -8,6 +8,7 @@
|
||||
SDL2,
|
||||
libpng,
|
||||
zlib,
|
||||
zlib' ? zlib.override { static = true; },
|
||||
xz,
|
||||
freetype,
|
||||
fontconfig,
|
||||
@@ -87,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
SDL2
|
||||
libpng
|
||||
xz
|
||||
zlib
|
||||
zlib'
|
||||
freetype
|
||||
fontconfig
|
||||
curl
|
||||
@@ -12345,19 +12345,6 @@ with pkgs;
|
||||
|
||||
openra = openraPackages.engines.release;
|
||||
|
||||
openttd = callPackage ../games/openttd {
|
||||
zlib = zlib.override {
|
||||
static = true;
|
||||
};
|
||||
};
|
||||
openttd-jgrpp = callPackage ../games/openttd/jgrpp.nix {
|
||||
zlib = zlib.override {
|
||||
static = true;
|
||||
};
|
||||
};
|
||||
openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
|
||||
openttd-nml = callPackage ../games/openttd/nml.nix { };
|
||||
|
||||
openxray = callPackage ../games/openxray {
|
||||
# Builds with Clang, but hits an assertion failure unless GCC is used
|
||||
# https://github.com/OpenXRay/xray-16/issues/1224
|
||||
|
||||
Reference in New Issue
Block a user