diff --git a/pkgs/development/libraries/smokegen/default.nix b/pkgs/development/libraries/smokegen/default.nix index 2a93965aeb39..643ae1064db7 100644 --- a/pkgs/development/libraries/smokegen/default.nix +++ b/pkgs/development/libraries/smokegen/default.nix @@ -1,18 +1,16 @@ -{ stdenv, lib, cmake, qt4, fetchzip }: +{ pkgs, lib, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { pname = "smokegen"; - version = "4.14.3"; - - src = fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; hash = "sha256-finsoruPeJZLawIjNUJ25Pq54eaCByfALVraNQJPk7c="; }; - - strictDeps = true; - nativeBuildInputs = [ cmake qt4 ]; - buildInputs = [ qt4 ]; - + buildInputs = [ pkgs.cmake pkgs.qt4 ]; + buildPhase = '' + cmake . + ''; meta = with lib; { description = "A general purpose C++ parser with a plugin infrastructure"; homepage = "https://invent.kde.org/unmaintained/smokegen"; diff --git a/pkgs/development/libraries/smokeqt/default.nix b/pkgs/development/libraries/smokeqt/default.nix index 1c427b8abb70..145a9f243bb3 100644 --- a/pkgs/development/libraries/smokeqt/default.nix +++ b/pkgs/development/libraries/smokeqt/default.nix @@ -1,22 +1,16 @@ -{ stdenv, lib, cmake, qt4, smokegen, fetchzip }: +{ pkgs, lib, ... }: -stdenv.mkDerivation rec { +pkgs.stdenv.mkDerivation rec { pname = "smokeqt"; - version = "4.14.3"; - - src = fetchzip { - url = "https://invent.kde.org/unmaintained/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; + version = "v4.14.3"; + src = pkgs.fetchzip { + url = "https://invent.kde.org/unmaintained/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; hash = "sha256-8FiEGF8gduVw5I/bi2wExGUWmjIjYEhWpjpXKJGBNMg="; }; - - strictDeps = true; - nativeBuildInputs = [ cmake smokegen ]; - buildInputs = [ qt4 ]; - cmakeFlags = [ "-DCMAKE_CXX_STANDARD=98" ]; - + buildInputs = [ pkgs.cmake pkgs.qt4 pkgs.smokegen ]; meta = with lib; { description = "Bindings for the Qt libraries"; homepage = "https://invent.kde.org/unmaintained/smokeqt";