From 455d9600e1dadc5c34d2dbdee81f9c77fcabff49 Mon Sep 17 00:00:00 2001 From: Marcus Crestani Date: Thu, 8 Jan 2015 09:19:10 +0100 Subject: [PATCH 1/5] libev: Enable on all platforms. --- pkgs/development/libraries/libev/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index b0c74c9e54c4..6b070c170c7d 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -20,7 +20,6 @@ rec { maintainers = [ a.lib.maintainers.raskin ]; - platforms = with a.lib.platforms; - linux ++ freebsd; + platforms = a.lib.platforms.all; }; } From ecc7d50e26bf6e0ee3568252325622d51daf9604 Mon Sep 17 00:00:00 2001 From: Marcus Crestani Date: Thu, 8 Jan 2015 09:20:51 +0100 Subject: [PATCH 2/5] IPCRun, JSONXS: Enable on OS X. --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 18e50ffdfa4e..ea0fd0c59c6b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4745,7 +4745,7 @@ let self = _self // overrides; _self = with self; { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "System() and background procs w/ piping, redirs, ptys (Unix, Win32)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; @@ -4958,7 +4958,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CommonSense ]; meta = { homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; }; From 8e2fb7c81658da0419569bce8a1efe4d2410c38b Mon Sep 17 00:00:00 2001 From: Marcus Crestani Date: Thu, 8 Jan 2015 21:31:14 +0100 Subject: [PATCH 3/5] i3: Set checkPhase only when on Linux. --- pkgs/applications/window-managers/i3/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 19d72559c5fe..f07c1d223109 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -24,7 +24,8 @@ stdenv.mkDerivation rec { doCheck = stdenv.system == "x86_64-linux"; - checkPhase = '' + checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") + '' ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy (cd testcases && perl complete-run.pl -p 1) ! grep -q '^not ok' testcases/latest/complete-run.log From 92ca6149347b563082d08bee5860927d22cb016c Mon Sep 17 00:00:00 2001 From: Marcus Crestani Date: Thu, 8 Jan 2015 21:46:05 +0100 Subject: [PATCH 4/5] i3: Use xcb-util-cursor-HEAD on OS X. --- .../libraries/xcb-util-cursor/HEAD.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/xcb-util-cursor/HEAD.nix diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix new file mode 100644 index 000000000000..9ca3474ce3b8 --- /dev/null +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig +, git, xlibs, gnum4, libxcb, gperf }: + +stdenv.mkDerivation rec { + name = "xcb-util-cursor-HEAD"; + + src = fetchgit { + url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; + rev = "f03cc278c6cce0cf721adf9c3764d3c5fba63392"; + sha256 = "1ljvq1gdc1lc33dwn4pzwppws2zgyqx51y3sd3c8gb7vcg5f27i5"; + }; + + meta = with stdenv.lib; { + description = "XCB cursor library (libxcursor port)"; + homepage = http://cgit.freedesktop.org/xcb/util-cursor; + license = licenses.mit; + maintainer = with maintainers; [ lovek323 ]; + platforms = platforms.linux ++ platforms.darwin; + }; + + buildInputs = [ + autoconf + automake + gnum4 + gperf + libtool + libxcb + pkgconfig + xlibs.utilmacros + xlibs.xcbutilimage + xlibs.xcbutilrenderutil + ]; + + configurePhase = '' + sed -i '15 i\ + LT_INIT' configure.ac + ${bashInteractive}/bin/bash autogen.sh --prefix="$out" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734a5c873b2a..5c83db5c64f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7381,6 +7381,8 @@ let xcb-util-cursor = callPackage ../development/libraries/xcb-util-cursor { }; + xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; + xdo = callPackage ../tools/misc/xdo { }; xineLib = callPackage ../development/libraries/xine-lib { @@ -10293,7 +10295,9 @@ let hydrogen = callPackage ../applications/audio/hydrogen { }; - i3 = callPackage ../applications/window-managers/i3 { }; + i3 = callPackage ../applications/window-managers/i3 { + xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor; + }; i3lock = callPackage ../applications/window-managers/i3/lock.nix { inherit (xorg) libxkbfile; From 852b6c10937625c3ec596bed3986a9bed1f0fc5d Mon Sep 17 00:00:00 2001 From: Marcus Crestani Date: Tue, 13 Jan 2015 10:11:02 +0100 Subject: [PATCH 5/5] rxvt-unicode: On OS X, add .PHONY target to Makefile.in. Due to the case-insensitive file system on OS X, `make install` does nothing, since it sees the INSTALL file as the up-to-date target. Adding a .PHONY target to the Makefile fixes this. --- pkgs/applications/misc/rxvt_unicode/default.nix | 3 ++- .../rxvt_unicode/rxvt-unicode-makefile-phony.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index b0334dcd7ce9..12eeb62dc043 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation (rec { patches = [ ./rxvt-unicode-9.06-font-width.patch ./rxvt-unicode-256-color-resources.patch - ]; + ] + ++ stdenv.lib.optional stdenv.isDarwin ./rxvt-unicode-makefile-phony.patch; preConfigure = '' diff --git a/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch new file mode 100644 index 000000000000..5e42e17c156a --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch @@ -0,0 +1,10 @@ +--- a/Makefile.in 2015-01-13 08:52:30.000000000 +0100 ++++ b/Makefile.in 2015-01-13 08:52:58.000000000 +0100 +@@ -30,6 +30,7 @@ + subdirs = src doc + + RECURSIVE_TARGETS = all allbin alldoc tags clean distclean realclean install ++.PHONY: $(RECURSIVE_TARGETS) + + #------------------------------------------------------------------------- +