From e47d2db90f59a201f00951be1c72da2f03d1e93f Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorickvanpelt@gmail.com>
Date: Sat, 30 Apr 2016 21:21:06 +0200
Subject: [PATCH] update nixos

---
 nix/.nixpkgs/config.nix | 27 +++++++++++++++++++++------
 nix/.nixpkgs/ftb.nix    |  9 ++++++---
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/nix/.nixpkgs/config.nix b/nix/.nixpkgs/config.nix
index d66f158..4944e2c 100644
--- a/nix/.nixpkgs/config.nix
+++ b/nix/.nixpkgs/config.nix
@@ -16,17 +16,24 @@
   let
     mkEnv = name: paths: pkgs.buildEnv { inherit name paths; };
     py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages;
-    py2 = python27Packages;
+    py2 = python27Packages; emc = emacsPackages; emcn = emacsPackagesNg;
   in rec {
     org = pkgs.emacsPackages.org.overrideDerivation (attrs: {
       nativeBuildInputs = [emacs texinfo tetex]; });
 
-    firefox-bin-wrapper = wrapFirefox firefox-bin {};
-
     wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
 
     ftb = pkgs.callPackage ./ftb.nix {};
 
+    spotify = pkgs.spotify.overrideDerivation (attrs: let
+      version = "1.0.28.89.gf959d4ce-37"; in {
+      name = "spotify-${version}";
+      src = fetchurl {
+        url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
+        sha256 = "06v6fmjn0zi1riqhbmwkrq4m1q1vs95p348i8c12hqvsrp0g2qy5";
+      };
+    });
+
 
     envs = recurseIntoAttrs {
 
@@ -44,14 +51,18 @@
         pavucontrol
       ];
       apps = mkEnv "y-apps" [
+        gajim
+        mutt
+        torbrowser
         # chromium
-        firefox-bin-wrapper
+        firefox-bin
         gimp
         hexchat
         #inkscape
         keepassx
         # libreoffice
-        skype
+        (builtins.storePath /nix/store/g6v35jgh2ik8fq9bjh4yac36aj8bd1h5-skype-4.3.0.37)
+        # skype
         spotify
         kde4.quasselClientWithoutKDE
         sublime3
@@ -89,8 +100,11 @@
         openssl
         sshfsFuse
         sshuttle iodine stow
+        expect
       ];
 
+      emacs = mkEnv "y-emacs" [emacs org emcn.smex emc.colorThemeSolarized];
+
       code = mkEnv "y-code" [
         cloc graphviz sloccount silver-searcher
         gnumake strace stack # hs?
@@ -111,7 +125,8 @@
       ];
 
       games = mkEnv "y-games" [
-        steam openttd wine winetricks minecraft
+        # steam openttd wine winetricks minecraft
+        openttd minecraft ftb
       ];
 
       js = mkEnv "y-jsdev" [
diff --git a/nix/.nixpkgs/ftb.nix b/nix/.nixpkgs/ftb.nix
index b5a0a95..280147c 100644
--- a/nix/.nixpkgs/ftb.nix
+++ b/nix/.nixpkgs/ftb.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, makeDesktopItem
+{ stdenv, lib, fetchurl, makeDesktopItem
 , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
 , mesa, openal, pulseaudioLight }:
 
+let
+lib_path = lib.concatMapStringsSep ":" (x: x.out + "/lib/") [libX11 libXext libXcursor libXrandr libXxf86vm mesa openal];
+in
  stdenv.mkDerivation {
     name = "ftb-1.4.12";
     src = fetchurl {
@@ -18,8 +21,8 @@
     cat > $out/bin/feedthebeast << EOF
     #!${stdenv.shell}
     # wrapper for minecraft
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
-    ${pulseaudioLight}/bin/padsp ${jre}/bin/java -jar $out/ftblaunch.jar
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${lib_path}
+    ${pulseaudioLight.out}/bin/padsp ${jre}/bin/java -jar $out/ftblaunch.jar
     EOF
     chmod +x $out/bin/feedthebeast
   '';