diff options
| author | Bastian Köcher <git@kchr.de> | 2017-08-28 22:14:11 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2017-08-28 22:14:11 +0200 |
| commit | 0da61beee937f7c22b8c609bc645d54fd4876465 (patch) | |
| tree | d25df2f3adc92a43ec279001b7b1e47824e9f31d /pkgs/development/tools/misc/xxdiff | |
| parent | 39cf16f10e744f748059d00f506b764f2d78e4c7 (diff) | |
| download | nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar.gz nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar.bz2 nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar.lz nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar.xz nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.tar.zst nixpkgs-0da61beee937f7c22b8c609bc645d54fd4876465.zip | |
xxdiff-tip: 20170101 -> 20170623
Updates the xxdiff-tip version and fixes compilation errors by forcing qt5.6.
Diffstat (limited to 'pkgs/development/tools/misc/xxdiff')
| -rw-r--r-- | pkgs/development/tools/misc/xxdiff/tip.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix index b613508c5c0..f05988e7026 100644 --- a/pkgs/development/tools/misc/xxdiff/tip.nix +++ b/pkgs/development/tools/misc/xxdiff/tip.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }: +{ stdenv, fetchFromBitbucket, qtbase, flex, bison, docutils }: stdenv.mkDerivation rec { - name = "xxdiff-4.0.1.20170101"; + name = "xxdiff-4.0.1.20170623"; src = fetchFromBitbucket { owner = "blais"; repo = "xxdiff"; - rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8"; - sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z"; + rev = "5e5f885dfc43559549a81c59e9e8c9525306356a"; + sha256 = "0gbvxrkwkbvag3298j89smszghpr8ilxxfb0cvsknfqdf15b296w"; }; - nativeBuildInputs = [ flex bison qt5.qtbase docutils ]; + nativeBuildInputs = [ flex bison docutils ]; - buildInputs = [ qt5.qtbase ]; + buildInputs = [ qtbase ]; preConfigure = '' - ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs - ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true + ln -s ${qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs + ln -s ${qtbase.dev}/bin/* ../__nix_qt*__/bin || true ''; - NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets"; + NIX_CFLAGS_COMPILE="-I${qtbase.dev}/include/QtCore -I${qtbase.dev}/include/QtGui -I${qtbase.dev}/include/QtWidgets"; configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap"; |