diff options
| author | Robin Mattheussen <me@romatthe.dev> | 2024-10-13 03:34:46 +0200 |
|---|---|---|
| committer | Robin Mattheussen <me@romatthe.dev> | 2024-10-13 03:34:46 +0200 |
| commit | 4f6cd4f94a5b152cd5c4df2445e589823a9fe902 (patch) | |
| tree | 77cec92356e418812ed57ac8f5141167b8916da7 | |
| parent | treewide: add CVE-2024-9680 as a known vulnerability to Firefox forks (#347601) (diff) | |
| download | nixpkgs-4f6cd4f94a5b152cd5c4df2445e589823a9fe902.tar.gz | |
exult: 1.8 -> 1.10.1
| -rw-r--r-- | pkgs/games/exult/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index ab09e4efed40..cc32d13617dc 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , SDL2 , autoconf +, autoconf-archive +, autoreconfHook , automake , libogg , libtool @@ -10,21 +12,31 @@ , pkg-config , zlib , enableTools ? false +# Darwin-specific +, AudioUnit }: stdenv.mkDerivation rec { pname = "exult"; - version = "1.8"; + version = "1.10.1"; src = fetchFromGitHub { owner = "exult"; repo = "exult"; rev = "v${version}"; - hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E="; + hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE="; }; + # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin + postPatch = '' + substituteInPlace macosx/macosx.am \ + --replace-fail DESTDIR NIX_DESTDIR + ''; + nativeBuildInputs = [ autoconf + autoconf-archive + autoreconfHook automake libtool pkg-config @@ -35,12 +47,13 @@ stdenv.mkDerivation rec { libogg libvorbis zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AudioUnit ]; - preConfigure = '' - ./autogen.sh - ''; + enableParallelBuilding = true; + makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch configureFlags = lib.optional (!enableTools) "--disable-tools"; meta = with lib; { @@ -58,5 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://exult.info"; license = licenses.gpl2Plus; maintainers = with maintainers; [ azahi ]; + mainProgram = "exult"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac40c890cd23..0b7e9ba4810e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34694,7 +34694,9 @@ with pkgs; extremetuxracer = callPackage ../games/extremetuxracer { }; - exult = callPackage ../games/exult { }; + exult = callPackage ../games/exult { + inherit (darwin.apple_sdk.frameworks) AudioUnit; + }; fallout-ce = callPackage ../games/fallout-ce/fallout-ce.nix { }; fallout2-ce = callPackage ../games/fallout-ce/fallout2-ce.nix { }; |