Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 76ebc0963d6d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 254d6e5cbf5d
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 6, 2020

  1. nfstrace: fix build 

    https://hydra.nixos.org/build/109722476
    @Ma27
    Ma27 committed Jan 6, 2020
    Copy the full SHA
    1bb691f View commit details

  2. nifskope: fix aarch64 build 

    https://hydra.nixos.org/build/109694386
    @Ma27
    Ma27 committed Jan 6, 2020
    Copy the full SHA
    254d6e5 View commit details
Showing with 26 additions and 2 deletions.
  1. +1 −1 pkgs/tools/graphics/nifskope/default.nix
  2. +19 −0 pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
  3. +6 −1 pkgs/tools/networking/nfstrace/default.nix
2 changes: 1 addition & 1 deletion pkgs/tools/graphics/nifskope/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
url = "https://github.com/niftools/nifskope/commit/30954e7f01f3d779a2a1fd37d363e8a6ad560bd3.patch";
sha256 = "0d6xjj2mjjhdd7w1aig5f75jksjni16jyj0lxsz51pys6xqb6fpj";
})
];
] ++ (stdenv.lib.optional stdenv.isAarch64 ./no-sse-on-arm.patch);

buildInputs = [ qtbase qttools libGLU.dev ];
nativeBuildInputs = [ qmake wrapQtAppsHook ];
19 changes: 19 additions & 0 deletions pkgs/tools/graphics/nifskope/no-sse-on-arm.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/NifSkope.pro b/NifSkope.pro
index cc29fc5..b17bb6e 100644
--- a/NifSkope.pro
+++ b/NifSkope.pro
@@ -428,13 +428,10 @@ win32 {
# Optimization flags
QMAKE_CXXFLAGS_DEBUG -= -O0 -g
QMAKE_CXXFLAGS_DEBUG *= -Og -g3
- QMAKE_CXXFLAGS_RELEASE *= -O3 -mfpmath=sse
+ QMAKE_CXXFLAGS_RELEASE *= -O3

# C++11 Support
QMAKE_CXXFLAGS_RELEASE *= -std=c++14
-
- # Extension flags
- QMAKE_CXXFLAGS_RELEASE *= -msse2 -msse
}

win32 {
7 changes: 6 additions & 1 deletion pkgs/tools/networking/nfstrace/default.nix
View file
Original file line number Diff line number Diff line change
@@ -18,13 +18,18 @@ stdenv.mkDerivation rec {
})
];

postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "-Wno-braced-scalar-init" ""
'';

buildInputs = [ json_c libpcap ncurses ];
nativeBuildInputs = [ cmake ];

# To build with GCC 8+ it needs:
CXXFLAGS = "-Wno-class-memaccess -Wno-ignored-qualifiers";
# CMake can't find json_c without:
NIX_CFLAGS_COMPILE = "-I${json_c.dev}/include/json-c";
NIX_CFLAGS_COMPILE = [ "-I${json_c.dev}/include/json-c" "-Wno-error=address-of-packed-member" ];

doCheck = false; # requires network access