diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/development/tools/misc/premake/default.nix | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/development/tools/misc/premake/default.nix')
-rw-r--r-- | pkgs/development/tools/misc/premake/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/premake/default.nix b/pkgs/development/tools/misc/premake/default.nix index 8dce23aa9593..770c80710953 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl, unzip }: let baseName = "premake"; version = "4.3"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1017rd0wsjfyq2jvpjjhpszaa7kmig6q1nimw76qx3cjz2868lrn"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; buildPhase = '' make -C build/gmake.unix/ @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; - maintainers = [maintainers.bjornfor]; + maintainers = [ maintainers.bjornfor ]; }; } |