Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9deca47b3320
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a0b29992a4e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 18, 2019

  1. odamex: 0.7.0 -> 0.8.1 (#69718) 

    * odamex: 0.7.0 -> 0.8.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/odamex/versions

* odamex: revamp

+ use pname and version
+ not broken anymore
+ restrict to Linux (never built on Darwin)
+ add wxGTK to build odalaunch client
    @r-ryantm @c0bw3b
    r-ryantm authored and c0bw3b committed Oct 18, 2019
    Copy the full SHA
    2a0b299 View commit details
Showing with 11 additions and 10 deletions.
  1. +11 −10 pkgs/games/odamex/default.nix
21 changes: 11 additions & 10 deletions pkgs/games/odamex/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }:
{ stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net, wxGTK30 }:

stdenv.mkDerivation rec {
pname = "odamex";
version = "0.8.1";

stdenv.mkDerivation {
name = "odamex-0.7.0";
src = fetchurl {
url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2;
sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a";
url = "mirror://sourceforge/${pname}/${pname}-src-${version}.tar.bz2";
sha256 = "1dz0lqdx3vb62mylqddcdq3vxsl2mvv0w2xskvwgpg0p04fcic2c";
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake SDL SDL_mixer SDL_net ];
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ SDL SDL_mixer SDL_net wxGTK30 ];

enableParallelBuilding = true;

meta = {
homepage = http://odamex.net/;
homepage = "http://odamex.net/";
description = "A client/server port for playing old-school Doom online";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ MP2E ];
broken = true;
};
}