From bc7a4fc18bba1926413fec5e49760c57514b482e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 22:36:52 +0200 Subject: [PATCH 1/5] webkitgtk: minor updates (close #7828) Builds fine, NEWS look good. --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 545026108876..e7dc0d4982c4 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.8.0"; + version = "2.8.3"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5"; + sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk"; }; patches = [ ./finding-harfbuzz-icu.patch ]; From 4ec3f8e42f9c765b58dd7e088f6c6943d319ad00 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 15 May 2015 22:44:51 +0200 Subject: [PATCH 2/5] intel-gpu-tools: apply patch to fix a compile error see https://bugs.gentoo.org/show_bug.cgi?id=548318 --- .../misc/intel-gpu-tools/compile-fix.patch | 37 +++++++++++++++++++ .../tools/misc/intel-gpu-tools/default.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch diff --git a/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch new file mode 100644 index 000000000000..8285867d8eda --- /dev/null +++ b/pkgs/development/tools/misc/intel-gpu-tools/compile-fix.patch @@ -0,0 +1,37 @@ +From 233808a58db1f62d773b03f9dad599924170aca6 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Wed, 18 Mar 2015 08:36:37 +0000 +Subject: lib/batch: Trivial compile fix for 32-bit builds + +intel_batchbuffer.c: In function 'fill_object': +intel_batchbuffer.c:589:20: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + obj->relocs_ptr = (uint64_t)relocs; + ^ +intel_batchbuffer.c: In function 'exec_blit': +intel_batchbuffer.c:598:21: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + exec.buffers_ptr = (uint64_t)objs; + +Signed-off-by: Chris Wilson + +diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c +index 666c323..c1c27a6 100644 +--- a/lib/intel_batchbuffer.c ++++ b/lib/intel_batchbuffer.c +@@ -548,7 +548,7 @@ fill_object(struct drm_i915_gem_exec_object2 *obj, uint32_t gem_handle, + memset(obj, 0, sizeof(*obj)); + obj->handle = gem_handle; + obj->relocation_count = count; +- obj->relocs_ptr = (uint64_t)relocs; ++ obj->relocs_ptr = (uintptr_t)relocs; + } + + static void exec_blit(int fd, +@@ -557,7 +557,7 @@ static void exec_blit(int fd, + { + struct drm_i915_gem_execbuffer2 exec; + +- exec.buffers_ptr = (uint64_t)objs; ++ exec.buffers_ptr = (uintptr_t)objs; + exec.buffer_count = count; + exec.batch_start_offset = 0; + exec.batch_len = batch_len * 4; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 72a364e682a3..997f1bfc0120 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 libXext libXv libXrandr glib bison ]; + patches = [ ./compile-fix.patch ]; + meta = with stdenv.lib; { homepage = https://01.org/linuxgraphics/; description = "Tools for development and testing of the Intel DRM driver"; From b7fe141f6bafbb783d2cced8118dd551a6de0e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 22:59:26 +0200 Subject: [PATCH 3/5] Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347. --- .../tools/build-managers/cmake/2.8.nix | 73 ++++++++++++++ .../build-managers/cmake/search-path.patch | 97 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 + 3 files changed, 175 insertions(+) create mode 100644 pkgs/development/tools/build-managers/cmake/2.8.nix create mode 100644 pkgs/development/tools/build-managers/cmake/search-path.patch diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix new file mode 100644 index 000000000000..60a941a66375 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +, useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null +}: + +with stdenv.lib; + +assert wantPS -> (ps != null); + +let + os = stdenv.lib.optionalString; + majorVersion = "2.8"; + minorVersion = "12.2"; + version = "${majorVersion}.${minorVersion}"; +in + +stdenv.mkDerivation rec { + name = "cmake-${os useNcurses "cursesUI-"}${os useQt4 "qt4UI-"}${version}"; + + inherit majorVersion; + + src = fetchurl { + url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; + sha256 = "0phf295a9cby0v7zqdswr238v5aiy3rb2fs6dz39zjxbmzlp8rcc"; + }; + + enableParallelBuilding = true; + + patches = + [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959 + name = "FindFreetype-2.5.patch"; + url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug"; + sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; + })] ++ + # Don't search in non-Nix locations such as /usr, but do search in + # Nixpkgs' Glibc. + optional (stdenv ? glibc) ./search-path.patch ++ + optional (stdenv ? cross) (fetchurl { + name = "fix-darwin-cross-compile.patch"; + url = "http://public.kitware.com/Bug/file_download.php?" + + "file_id=4981&type=bug"; + sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; + }); + + buildInputs = [ curl expat zlib bzip2 libarchive ] + ++ optional useNcurses ncurses + ++ optional useQt4 qt4; + + propagatedBuildInputs = optional wantPS ps; + + CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; + + configureFlags = + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + + stdenv.lib.optionalString useQt4 " --qt-gui"; + + setupHook = ./setup-hook.sh; + + dontUseCmakeConfigure = true; + + preConfigure = optionalString (stdenv ? glibc) + '' + source $setupHook + fixCmakeFiles . + substituteInPlace Modules/Platform/UnixPaths.cmake --subst-var-by glibc ${stdenv.glibc} + ''; + + meta = { + homepage = http://www.cmake.org/; + description = "Cross-Platform Makefile Generator"; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/search-path.patch b/pkgs/development/tools/build-managers/cmake/search-path.patch new file mode 100644 index 000000000000..31c85d6f5220 --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/search-path.patch @@ -0,0 +1,97 @@ +diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake +index fe8e003..378512c 100644 +--- a/Modules/Platform/Linux.cmake ++++ b/Modules/Platform/Linux.cmake +@@ -36,13 +36,13 @@ else() + # checking the platform every time. This option is advanced enough + # that only package maintainers should need to adjust it. They are + # capable of providing a setting on the command line. +- if(EXISTS "/etc/debian_version") +- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL +- "Install .so files without execute permission.") +- else() ++ # if(EXISTS "/etc/debian_version") ++ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL ++ # "Install .so files without execute permission.") ++ # else() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") +- endif() ++ # endif() + endif() + + # Match multiarch library directory names. +@@ -52,6 +52,6 @@ include(Platform/UnixPaths) + + # Debian has lib64 paths only for compatibility so they should not be + # searched. +-if(EXISTS "/etc/debian_version") +- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) +-endif() ++# if(EXISTS "/etc/debian_version") ++# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) ++#endif() +diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake +index ccb2663..39834e6 100644 +--- a/Modules/Platform/UnixPaths.cmake ++++ b/Modules/Platform/UnixPaths.cmake +@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) + # search types. + list(APPEND CMAKE_SYSTEM_PREFIX_PATH + # Standard +- /usr/local /usr / +- +- # CMake install location +- "${_CMAKE_INSTALL_DIR}" +- +- # Project install destination. +- "${CMAKE_INSTALL_PREFIX}" +- ) +- +-# List common include file locations not under the common prefixes. +-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH +- # Windows API on Cygwin +- /usr/include/w32api +- +- # X11 +- /usr/X11R6/include /usr/include/X11 +- +- # Other +- /usr/pkg/include +- /opt/csw/include /opt/include +- /usr/openwin/include +- ) +- +-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH +- # Windows API on Cygwin +- /usr/lib/w32api +- +- # X11 +- /usr/X11R6/lib /usr/lib/X11 +- +- # Other +- /usr/pkg/lib +- /opt/csw/lib /opt/lib +- /usr/openwin/lib +- ) +- +-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH +- /usr/pkg/bin ++ "@glibc@" + ) + + list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES +- /lib /usr/lib /usr/lib32 /usr/lib64 ++ "@glibc@/lib" + ) + + list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES +- /usr/include ++ "@glibc@/include" + ) + + # Enable use of lib64 search path variants by default. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f60e8905e58e..2f4725c27495 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5088,6 +5088,11 @@ let ctodo = callPackage ../applications/misc/ctodo { }; + cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { + wantPS = stdenv.isDarwin; + ps = if stdenv.isDarwin then darwin.ps else null; + }; + cmake = callPackage ../development/tools/build-managers/cmake { wantPS = stdenv.isDarwin; ps = if stdenv.isDarwin then darwin.ps else null; From 120852e542aa60de548b2db49811cc5484f72218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 23:03:59 +0200 Subject: [PATCH 4/5] freerdpUnstable, cinepaint: fix by using older cmake Close #7841. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f4725c27495..907b97d8d85e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10484,6 +10484,7 @@ let cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; + cmake = cmake-2_8; }; codeblocks = callPackage ../applications/editors/codeblocks { }; @@ -11006,7 +11007,9 @@ let ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { }; + freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { + cmake = cmake-2_8; + }; freicoin = callPackage ../applications/misc/freicoin { }; From d417983216d1fdc54c675cd7a242445b432ce455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 15 May 2015 23:23:51 +0200 Subject: [PATCH 5/5] dmenu2: add version (dashed date) /cc maintainer @cstrahan. --- pkgs/applications/misc/dmenu2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/dmenu2/default.nix b/pkgs/applications/misc/dmenu2/default.nix index 1637586eb477..54aec8606cd4 100644 --- a/pkgs/applications/misc/dmenu2/default.nix +++ b/pkgs/applications/misc/dmenu2/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "dmenu2"; + name = "dmenu2-0.3pre-2014-07-08"; src = fetchhg { url = "https://bitbucket.org/melek/dmenu2";