diff options
Diffstat (limited to 'pkgs/development/tools/misc')
-rw-r--r-- | pkgs/development/tools/misc/premake/5.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/misc/seer/default.nix | 12 |
2 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 841e8480da1ab..d33a9c73c9c7f 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ - --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ + --replace-fail '"-arch arm64"' '""' \ + --replace-fail '"-arch x86_64"' '""' '' + lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace \ binmodules/example/premake5.lua \ @@ -34,6 +36,10 @@ stdenv.mkDerivation rec { make -f Bootstrap.mak linux ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ]); + installPhase = '' install -Dm755 bin/release/premake5 $out/bin/premake5 ''; @@ -47,6 +53,5 @@ stdenv.mkDerivation rec { mainProgram = "premake5"; license = lib.licenses.bsd3; platforms = lib.platforms.darwin ++ lib.platforms.linux; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/development/tools/misc/seer/default.nix b/pkgs/development/tools/misc/seer/default.nix index b797287a02dc2..abc718b15893b 100644 --- a/pkgs/development/tools/misc/seer/default.nix +++ b/pkgs/development/tools/misc/seer/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gdb, qtcharts, qtbase, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, gdb, kdePackages, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "seer"; - version = "1.17"; + version = "2.4"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-lM6w+QwIRYP/2JDx4yynJxhVXt8SouOWgsLGXSwolIw="; + sha256 = "sha256-ZvoRC34496fUldL3jOdxcO/TVmfPNmmr2GkJG4gJXzk="; }; preConfigure = '' @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace src/{SeerGdbConfigPage,SeerMainWindow,SeerGdbWidget}.cpp \ - --replace "/usr/bin/gdb" "${gdb}/bin/gdb" + --replace-fail "/usr/bin/gdb" "${gdb}/bin/gdb" ''; - buildInputs = [ qtbase qtcharts ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; + buildInputs = with kdePackages; [ qtbase qtcharts qtsvg ]; + nativeBuildInputs = [ cmake kdePackages.wrapQtAppsHook ]; meta = with lib; { description = "A Qt gui frontend for GDB"; |