diff options
author | Tim Steinbach <NeQuissimus@users.noreply.github.com> | 2016-10-24 13:43:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-24 13:43:09 -0400 |
commit | bca2fd9f58b3cfede9a96da5dbd471f5afb3ee67 (patch) | |
tree | 3a764a00ad260cc7f8ec8774ee78f1b0a95db742 /pkgs | |
parent | ef45c1928aecee3ef92394d696435cd6af2faca0 (diff) | |
parent | db9958cdb941cd052ca4b2cbb063aca8f4f05a80 (diff) |
Merge pull request #19831 from AbigailBuccaneer/gmad
gmad: init at HEAD
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/bootil/default.nix | 43 | ||||
-rw-r--r-- | pkgs/games/gmad/default.nix | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 81 insertions, 0 deletions
diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix new file mode 100644 index 0000000000000..727c6bfc4f3f9 --- /dev/null +++ b/pkgs/development/libraries/bootil/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, fetchpatch, premake4 }: + +stdenv.mkDerivation rec { + name = "bootil-unstable-2015-12-17"; + + meta = { + description = "Garry Newman's personal utility library"; + homepage = https://github.com/garrynewman/bootil; + # License unsure - see https://github.com/garrynewman/bootil/issues/21 + license = stdenv.lib.licenses.free; + maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; + platforms = stdenv.lib.platforms.all; + }; + + src = fetchFromGitHub { + owner = "garrynewman"; + repo = "bootil"; + rev = "1d3e321fc2be359e2350205b8c7f1cad2164ee0b"; + sha256 = "03wq526r80l2px797hd0n5m224a6jibwipcbsvps6l9h740xabzg"; + }; + + patches = [ (fetchpatch { + url = https://github.com/garrynewman/bootil/pull/22.patch; + name = "github-pull-request-22.patch"; + sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; + })]; + + platform = + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macosx" + else abort "unrecognized platform"; + + buildInputs = [ premake4 ]; + + configurePhase = "premake4 --file=projects/premake4.lua gmake"; + makeFlags = "-C projects/${platform}/gmake"; + + installPhase = '' + mkdir -p $out/lib + cp lib/${platform}/gmake/libbootil_static.a $out/lib/ + cp -r include $out/ + ''; +} diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix new file mode 100644 index 0000000000000..a15914877ccb1 --- /dev/null +++ b/pkgs/games/gmad/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, premake4, bootil }: + +stdenv.mkDerivation rec { + name = "gmad-unstable-2015-04-16"; + + meta = { + description = "Garry's Mod Addon Creator and Extractor"; + homepage = https://github.com/garrynewman/gmad; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; + platforms = stdenv.lib.platforms.all; + }; + + src = fetchFromGitHub { + owner = "garrynewman"; + repo = "gmad"; + rev = "377f3458bf1ecb8a1a2217c2194773e3c2a2dea0"; + sha256="0myi9njr100gxhxk1vrzr2sbij5kxl959sq0riiqgg01div338g0"; + }; + + buildInputs = [ premake4 bootil ]; + + targetName = + if stdenv.isLinux then "gmad_linux" + else if stdenv.isDarwin then "gmad_osx" + else "gmad"; + + configurePhase = "premake4 --bootil_lib=${bootil}/lib --bootil_inc=${bootil}/include gmake"; + + installPhase = '' + mkdir -p $out/bin + cp ${targetName} $out/bin/gmad + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 074b601fdaa2e..7fccec26476dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15542,6 +15542,8 @@ in gltron = callPackage ../games/gltron { }; + gmad = callPackage ../games/gmad { }; + gnubg = callPackage ../games/gnubg { }; gnuchess = callPackage ../games/gnuchess { }; @@ -16804,6 +16806,8 @@ in blackbird = callPackage ../misc/themes/blackbird { }; + bootil = callPackage ../development/libraries/bootil { }; + brgenml1lpr = callPackage_i686 ../misc/cups/drivers/brgenml1lpr {}; brgenml1cupswrapper = callPackage ../misc/cups/drivers/brgenml1cupswrapper {}; |