diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/games/0ad | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/games/0ad')
| -rw-r--r-- | nixpkgs/pkgs/games/0ad/data.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/0ad/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/games/0ad/game.nix | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/games/0ad/data.nix b/nixpkgs/pkgs/games/0ad/data.nix index eeedae924405..1bebf922c48d 100644 --- a/nixpkgs/pkgs/games/0ad/data.nix +++ b/nixpkgs/pkgs/games/0ad/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zeroad-unwrapped }: +{ lib, stdenv, fetchurl, zeroad-unwrapped }: stdenv.mkDerivation rec { pname = "0ad-data"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp -r binaries/data $out/share/0ad/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source game of ancient warfare -- data files"; homepage = "https://play0ad.com/"; license = licenses.cc-by-sa-30; diff --git a/nixpkgs/pkgs/games/0ad/default.nix b/nixpkgs/pkgs/games/0ad/default.nix index d53942766bb2..860db7c6d5ae 100644 --- a/nixpkgs/pkgs/games/0ad/default.nix +++ b/nixpkgs/pkgs/games/0ad/default.nix @@ -1,14 +1,14 @@ -{ wxGTK, newScope }: - +{ wxGTK, stdenv, newScope }: let callPackage = newScope self; self = { - zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; }; + zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK stdenv; }; - zeroad-data = callPackage ./data.nix { }; + zeroad-data = callPackage ./data.nix { inherit stdenv; }; zeroad = callPackage ./wrapper.nix { }; }; -in self +in +self diff --git a/nixpkgs/pkgs/games/0ad/game.nix b/nixpkgs/pkgs/games/0ad/game.nix index 4c9ad7068878..1ba975aa8854 100644 --- a/nixpkgs/pkgs/games/0ad/game.nix +++ b/nixpkgs/pkgs/games/0ad/game.nix @@ -1,5 +1,5 @@ { stdenv, lib, perl, fetchurl, python2 -, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium +, pkg-config, spidermonkey_38, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 , gloox, nvidia-texture-tools @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0draa53xg69i5qhqym85658m45xhwkbiimaldj4sr3703rjgggq1"; }; - nativeBuildInputs = [ python2 perl pkgconfig ]; + nativeBuildInputs = [ python2 perl pkg-config ]; buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg @@ -47,10 +47,10 @@ stdenv.mkDerivation rec { # Delete shipped libraries which we don't need. rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey} - # Workaround invalid pkgconfig name for mozjs - mkdir pkgconfig - ln -s ${spidermonkey_38}/lib/pkgconfig/* pkgconfig/mozjs-38.pc - PKG_CONFIG_PATH="$PWD/pkgconfig:$PKG_CONFIG_PATH" + # Workaround invalid pkg-config name for mozjs + mkdir pkg-config + ln -s ${spidermonkey_38}/lib/pkgconfig/* pkg-config/mozjs-38.pc + PKG_CONFIG_PATH="$PWD/pkg-config:$PKG_CONFIG_PATH" # Update Makefiles pushd build/workspaces @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A free, open-source game of ancient warfare"; homepage = "https://play0ad.com/"; license = with licenses; [ |