From e180e018fea272359017ca98f4f36f98935d7f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Aug 2018 09:18:16 +0100 Subject: [PATCH] Xaw3d: add license, move build tools nativeBuildInputs --- pkgs/development/libraries/Xaw3d/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 0a71186cd4c7..0a7f02f17e59 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -1,4 +1,6 @@ -{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}: +{ stdenv, fetchurl +, imake, gccmakedep, bison, flex, pkgconfig +, xlibsWrapper, libXmu, libXpm, libXp }: stdenv.mkDerivation { name = "Xaw3d-1.6.3"; @@ -6,12 +8,13 @@ stdenv.mkDerivation { url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [imake gccmakedep libXpm libXp bison flex]; - propagatedBuildInputs = [xlibsWrapper libXmu]; + nativeBuildInputs = [ pkgconfig bison flex imake gccmakedep ]; + buildInputs = [ libXpm libXp ]; + propagatedBuildInputs = [ xlibsWrapper libXmu ]; - meta = { + meta = with stdenv.lib; { description = "3D widget set based on the Athena Widget set"; platforms = stdenv.lib.platforms.unix; + license = licenses.mit; }; }