From 9633db5bb621266ac4cff26838df4b0057224d75 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 6 Aug 2021 22:01:24 -0300 Subject: [PATCH 1/2] bochs: 2.6.11 -> 2.7 --- pkgs/applications/virtualization/bochs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index a54411eca9e2..2fe6555ad991 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { version = "2.7"; src = fetchurl { - url = "mirror://sourceforge/project/bochs/bochs/${version}/bochs-${version}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; hash = "sha256-oBCrG/3HKsWgjS4kEs1HHA/r1mrx2TSbwNeWh53lsXo="; }; From 5a32b487b535977ac6f46f2bf638a99c3b984b20 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 6 Aug 2021 20:47:09 -0300 Subject: [PATCH 2/2] bochs: move libtool to nativeBuildInputs --- pkgs/applications/virtualization/bochs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 2fe6555ad991..5f3b31870dc1 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl + libtool pkg-config ]; buildInputs = [ @@ -37,7 +38,6 @@ stdenv.mkDerivation rec { curl gtk2 libGL - libtool libGLU libX11 libXpm @@ -131,4 +131,4 @@ stdenv.mkDerivation rec { }; } # TODO: a better way to organize the options -# TODO: docbook (install docbook-tools from RedHat mirrors can help) +# TODO: docbook (docbook-tools from RedHat mirrors should help)