diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-01-03 23:55:00 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-02-19 11:03:39 +0000 |
commit | f4cf97a04cd5d0b86aa46baec9fb228a8f671c03 (patch) | |
tree | 28192415ff39a661d0001563bf81cc93fa25d16d /nixpkgs/pkgs/development/libraries/gamenetworkingsockets | |
parent | f8422837c9bde058e8f2de37702e7e94b2226040 (diff) | |
parent | 18c84ea816348e2a098390101b92d1e39a9dbd45 (diff) | |
download | nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.gz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.bz2 nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.lz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.xz nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.tar.zst nixlib-f4cf97a04cd5d0b86aa46baec9fb228a8f671c03.zip |
Merge commit '18c84ea816348e2a098390101b92d1e39a9dbd45'
Conflicts: nixpkgs/nixos/modules/misc/documentation.nix nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/go-modules/generic/default.nix nixpkgs/pkgs/development/interpreters/ruby/default.nix nixpkgs/pkgs/development/interpreters/ruby/patchsets.nix nixpkgs/pkgs/development/libraries/boehm-gc/7.6.6.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix nixpkgs/pkgs/servers/mail/mailman/web.nix nixpkgs/pkgs/top-level/aliases.nix nixpkgs/pkgs/top-level/all-packages.nix nixpkgs/pkgs/top-level/impure.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/gamenetworkingsockets')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix index 0546bfb8e08e..8fcb5b2230e0 100644 --- a/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix +++ b/nixpkgs/pkgs/development/libraries/gamenetworkingsockets/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "GameNetworkingSockets"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = pname; rev = "v${version}"; - sha256 = "1zghyc4liml8gzxflyh5gp6zi11ny6ng5hv9wyqvp32rfx221gc6"; + sha256 = "1d3k1ciw8c8rznxsr4bfmw0f0srblpflv8xqavhcxx2zwvaya78c"; }; nativeBuildInputs = [ cmake ninja go ]; @@ -18,11 +18,10 @@ stdenv.mkDerivation rec { # tmp home for go preBuild = "export HOME=\"$TMPDIR\""; - buildInputs = [ protobuf openssl ]; + buildInputs = [ protobuf ]; + propagatedBuildInputs = [ openssl ]; meta = with lib; { - # build failure is resolved on master, remove at next release - broken = stdenv.isDarwin; description = "GameNetworkingSockets is a basic transport layer for games"; license = licenses.bsd3; platforms = platforms.unix; |