From b10940cd2367c3331ddb8961ebd8fbd842242ccd Mon Sep 17 00:00:00 2001 From: Free Potion <42352817+freepotion@users.noreply.github.com> Date: Wed, 10 Oct 2018 04:45:38 +0300 Subject: [PATCH] boohu: leave one package There will be only one version of the package with the fewest external dependencies. --- pkgs/games/boohu/default.nix | 14 ++++---------- pkgs/games/boohu/deps.nix | 20 -------------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 pkgs/games/boohu/deps.nix diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 6d4129edbd0..92eccd67a1f 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -1,8 +1,8 @@ -{stdenv, lib, fetchurl, buildGoPackage, ansiTag ? false}: +{stdenv, fetchurl, buildGoPackage}: buildGoPackage rec { - name = if ansiTag then "boohu-ansi-${version}" else "boohu-${version}"; + name = "boohu-${version}"; version = "0.10.0"; goPackagePath = "git.tuxfamily.org/boohu/boohu.git"; @@ -12,15 +12,9 @@ buildGoPackage rec { sha256 = "a4d1fc488cfeecbe0a5e9be1836d680951941014f926351692a8dbed9042eba6"; }; - goDeps = ./deps.nix; + buildFlags = "--tags ansi"; - # If ansiTag is true, the "--tags ansi" will be passed - buildFlags = if ansiTag then "--tags ansi" else ""; - - # If ansiTag is true, binary output file name will be "boohu-ansi". - # Otherwise it will be "boohu". - postInstall = if ansiTag then "mv $bin/bin/boohu.git $bin/bin/boohu-ansi" - else "mv $bin/bin/boohu.git $bin/bin/boohu"; + postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; meta = with stdenv.lib; { description = "A new roguelike game"; diff --git a/pkgs/games/boohu/deps.nix b/pkgs/games/boohu/deps.nix deleted file mode 100644 index 8b6b3281193..00000000000 --- a/pkgs/games/boohu/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "b66b20ab708e289ff1eb3e218478302e6aec28ce"; - sha256 = "0wrgnwfdxrspni5q15vzr5q1bxnzb7m6q4xjhllcyddgn2zqprsa"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index becd4148f1f..f3e54fa8d76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19933,8 +19933,6 @@ with pkgs; boohu = callPackage ../games/boohu { }; - boohu-ansi = callPackage ../games/boohu { ansiTag = true; }; - braincurses = callPackage ../games/braincurses { }; brogue = callPackage ../games/brogue { };