diff options
| author | adisbladis <adis@blad.is> | 2018-01-14 02:40:43 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-14 02:41:04 +0800 |
| commit | e2f7267ba2f89e858fc60b6033f0f85191b1ee61 (patch) | |
| tree | 4428de3e1a6854ed0f97bf197e556ec2a7042af1 | |
| parent | ed70c591a4938ba4c99850f6cab561c4dc726bbd (diff) | |
| download | nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar.gz nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar.bz2 nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar.lz nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar.xz nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.tar.zst nixpkgs-e2f7267ba2f89e858fc60b6033f0f85191b1ee61.zip | |
xxdiff-tip: Build with qt59
| -rw-r--r-- | pkgs/development/tools/misc/xxdiff/tip.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index d3b69901ed8..844758c0f06 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase ]; + # Fixes build with Qt 5.9 + NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; + preConfigure = '' cd src make -f Makefile.bootstrap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 988cf446a00..4463b5b77d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7962,7 +7962,7 @@ with pkgs; xxdiff = callPackage ../development/tools/misc/xxdiff { bison = bison2; }; - xxdiff-tip = qt56.callPackage ../development/tools/misc/xxdiff/tip.nix { }; + xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { }; yacc = bison; |