Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 71c059d12a83
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e985ffea2d64
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 28, 2020

  1. pokerth: use mkDerivation from Qt 

    (cherry picked from commit 75bb71b)
    @mmilata @infinisil
    mmilata authored and infinisil committed May 28, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    infinisil Silvan Mosberger
    GPG key ID: E8F1E9EAD284E17D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e985ffe View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/games/pokerth/default.nix
6 changes: 3 additions & 3 deletions pkgs/games/pokerth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
, tinyxml2, target ? "client" }:

@@ -15,7 +15,7 @@ let
'';
in

stdenv.mkDerivation rec {
mkDerivation rec {
name = "pokerth-${target}-${version}";
version = "1.1.2";

@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

meta = {
homepage = https://www.pokerth.net;
homepage = "https://www.pokerth.net";
description = "Poker game ${target}";
license = licenses.gpl3;
maintainers = with maintainers; [ obadz yegortimoshenko ];