ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-14 05:37:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'osx-i3-urxvt' of git://github.com/cresh/nixpkgs

Browse Source
This commit is contained in:
Shea Levy 2015-02-04 22:14:52 +00:00
commit e14d39b97b
7 changed files with 61 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -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 =
''

10
pkgs/applications/misc/rxvt_unicode/rxvt-unicode-makefile-phony.patch Normal file
View File

@ -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)
#-------------------------------------------------------------------------

3
pkgs/applications/window-managers/i3/default.nix
View File

@ -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

3
pkgs/development/libraries/libev/default.nix
View File

@ -20,7 +20,6 @@ rec {
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
linux ++ freebsd;
platforms = a.lib.platforms.all;
};
}

39
pkgs/development/libraries/xcb-util-cursor/HEAD.nix Normal file
View File

@ -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"
'';
}

6
pkgs/top-level/all-packages.nix
View File

@ -7384,6 +7384,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 {
@ -10300,7 +10302,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;

4
pkgs/top-level/perl-packages.nix
View File

@ -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;
};
};