diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/aspcud/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/bcunit/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/ddate/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/sdl-jstest/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/wv2/default.nix | 6 |
5 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index b58f603ce5943..a42e6c4a428ef 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0vrf7h7g99vw1mybqfrpxamsnf89p18czlzgjmxl1zkiwc7vjpzw"; }; - buildInputs = [ boost clasp cmake gringo re2c ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost clasp gringo re2c ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 203735d79b0b6..95a9d6f98f8c8 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # https://gitlab.linphone.org/BC/public/bcunit/issues/1 version = "unstable-2019-11-19"; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index 04a89ec3dd0fa..024572eaa7a8c 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, cmake} : +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "ddate"; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; - license = stdenv.lib.licenses.publicDomain; - maintainers = with stdenv.lib.maintainers; [ kovirobi ]; - platforms = stdenv.lib.platforms.all; + license = licenses.publicDomain; + maintainers = with maintainers; [ kovirobi ]; + platforms = platforms.all; }; } diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index bb1bf6b0a3771..13b143559e98c 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl, git }: +{ stdenv, fetchgit, cmake, pkg-config, SDL, SDL2, ncurses, docbook_xsl, git }: stdenv.mkDerivation { pname = "sdl-jstest"; @@ -12,8 +12,8 @@ stdenv.mkDerivation { }; buildInputs = [ SDL SDL2 ncurses ]; - nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; - + nativeBuildInputs = [ cmake pkg-config docbook_xsl git ]; + meta = with stdenv.lib; { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index abac98d855f34..8ed0455a33ea5 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, cmake, libgsf, glib, libxml2 }: +{ stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { name = "wv2-0.4.2"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-include.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake libgsf glib libxml2 ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgsf glib libxml2 ]; NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; |