public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2677 from bennofs/xmobar-mpd

Browse Source 
haskell-xmobar: build with mpd support
This commit is contained in:
Austin Seipp
2014-05-17 16:45:03 -05:00
parent a0c6f07be4 a7b67d93c1
commit 9d2a85badb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/xmobar/default.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl { cabal, alsaCore, alsaMixer, filepath, HTTP, libXrandr, mtl
, parsec, regexCompat, stm, time, utf8String, wirelesstools, X11 , parsec, regexCompat, stm, time, utf8String, wirelesstools, X11, libmpd
, X11Xft , X11Xft
}: }:
@@ -11,10 +11,10 @@ cabal.mkDerivation (self: {
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time alsaCore alsaMixer filepath HTTP mtl parsec regexCompat stm time
utf8String X11 X11Xft utf8String X11 X11Xft libmpd
]; ];
extraLibraries = [ libXrandr wirelesstools ]; extraLibraries = [ libXrandr wirelesstools ];
configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa"; configureFlags = "-fwith_xft -fwith_iwlib -fwith_alsa -fwith_mpd";
meta = { meta = {
homepage = "http://projects.haskell.org/xmobar/"; homepage = "http://projects.haskell.org/xmobar/";
description = "A Minimalistic Text Based Status Bar"; description = "A Minimalistic Text Based Status Bar";
pkgs/applications/virtualization/virtualbox/default.nix
+4 -4
View File
@@ -11,7 +11,7 @@ with stdenv.lib;
let let
version = "4.3.10"; # changes ./guest-additions as well version = "4.3.12"; # changes ./guest-additions as well
forEachModule = action: '' forEachModule = action: ''
for mod in \ for mod in \
@@ -31,13 +31,13 @@ let
''; '';
# See https://github.com/NixOS/nixpkgs/issues/672 for details # See https://github.com/NixOS/nixpkgs/issues/672 for details
extpackRevision = "93012"; extpackRevision = "93733";
extensionPack = requireFile rec { extensionPack = requireFile rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
# IMPORTANT: Hash must be base16 encoded because it's used as an input to # IMPORTANT: Hash must be base16 encoded because it's used as an input to
# VBoxExtPackHelperApp! # VBoxExtPackHelperApp!
# Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS
sha256 = "ec3f2a98373d5e228acb4756ac07f44212c4d53f6b83deee81b791abb0d2608a"; sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f";
message = '' message = ''
In order to use the extension pack, you need to comply with the VirtualBox Personal Use In order to use the extension pack, you need to comply with the VirtualBox Personal Use
and Evaluation License (PUEL) by downloading the related binaries from: and Evaluation License (PUEL) by downloading the related binaries from:
@@ -56,7 +56,7 @@ in stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
sha256 = "739835aee3274a663b23eeb748bd0430e8a5d8ba2f4d0eae5dc47ff2c485e23b"; sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f";
}; };
buildInputs = buildInputs =
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "247e15e9a205dcd4761f6cb547ceca2a61e8d6905c1930870939fd323f4cd1ae"; sha256 = "c76dd5ec86f61ad72263ab6d2405723b06badfc2fae57f83ffa5de96f553400d";
}; };
KERN_DIR = "${kernel.dev}/lib/modules/*/build"; KERN_DIR = "${kernel.dev}/lib/modules/*/build";