diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:37:06 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-09 19:37:06 +0200 |
commit | 97006eb5ede130b8f5cb0fc98d0996507948ba49 (patch) | |
tree | fd8c7ab91ea374a8bd328c8a7ee08c0207f82ba6 /pkgs | |
parent | 35f47bcfd8aa2f5d38fe565ba32ac62cbfd63118 (diff) | |
parent | 9b080f87e417a388bca8fc9826765491ec1c826c (diff) | |
download | nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar.gz nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar.bz2 nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar.lz nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar.xz nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.tar.zst nixlib-97006eb5ede130b8f5cb0fc98d0996507948ba49.zip |
Merge #2638: fix weechat build on darwin
Conflicts (trivial): pkgs/development/python-modules/pycrypto/default.nix
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/irc/weechat/default.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/weechat/devel.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/pycrypto/default.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 29 |
4 files changed, 58 insertions, 16 deletions
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index b47018e0d970..954651d79e95 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake - ]; + cacert cmake ] + ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; # This patch is based on # weechat/c324610226cef15ecfb1235113c8243b068084c8. It fixes @@ -24,17 +24,23 @@ stdenv.mkDerivation rec { # then. patches = [ ./fix-gnutls-32.diff ]; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + postInstall = '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" + '' + '' + wrapProgram "$out/bin/weechat" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$NIX_PYTHONPATH" ''; meta = { homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix index 0ad05089c62b..25cc8dd76603 100644 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ b/pkgs/applications/networking/irc/weechat/devel.nix @@ -16,20 +16,26 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake - ]; + cacert cmake ] + ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; + + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; postInstall = '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$out/lib/${python.libPrefix}/site-packages" + NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" + '' + '' + wrapProgram "$out/bin/weechat" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PYTHONPATH : "$NIX_PYTHONPATH" ''; meta = { - homepage = http://www.weechat.org/; + homepage = http://www.weechat.org/; description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ garbas the-kenny ]; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index b203eebf90cd..c8f0f74c1ff1 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -13,6 +13,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long + meta = { homepage = "http://www.pycrypto.org/"; description = "Python Cryptography Toolkit"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb8e426fc454..13edd419076c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9283,4 +9283,33 @@ rec { }; }; + pync = buildPythonPackage rec { + version = "1.4"; + baseName = "pync"; + name = "${baseName}-${version}"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/${baseName}/${name}.tar.gz"; + md5 = "5cc79077f386a17b539f1e51c05a3650"; + }; + + buildInputs = [ pkgs.coreutils ]; + + propagatedBuildInputs = [ dateutil ]; + + preInstall = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.rubyLibs.terminal_notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py + ''; + + meta = with stdenv.lib; { + description = "Python Wrapper for Mac OS 10.8 Notification Center"; + homepage = https://pypi.python.org/pypi/pync/1.4; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = [ maintainers.lovek323 ]; + }; + }; + + + }); in pythonPackages |