diff --git a/nix/.nixpkgs/config.nix b/nix/.nixpkgs/config.nix index 791379f..d66f158 100644 --- a/nix/.nixpkgs/config.nix +++ b/nix/.nixpkgs/config.nix @@ -1,7 +1,7 @@ { allowUnfree = true; - binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; + #binaryCachePublicKeys = [ "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" ]; firefox = { enableGoogleTalkPlugin = true; enableAdobeFlash = true; @@ -18,8 +18,16 @@ py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages; py2 = python27Packages; 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 {}; + + envs = recurseIntoAttrs { de = mkEnv "y-de-deps" [ @@ -36,7 +44,7 @@ pavucontrol ]; apps = mkEnv "y-apps" [ - chromium + # chromium firefox-bin-wrapper gimp hexchat @@ -55,7 +63,8 @@ media = mkEnv "y-media" [ js.peerflix - py3.livestreamer py3.youtube-dl + py3.livestreamer + py3.youtube-dl mpv aria2 ]; @@ -117,7 +126,25 @@ wmname xev xlsfonts xwininfo glxinfo ]; + ndl = mkEnv "y-ndl" [ + arduino screen + ]; + }; + pandocdeps = (pkgs.texlive.combine { + inherit (pkgs.texlive) + scheme-basic + # explicit list pandoc tex dependencies + amsfonts amsmath lm ec ifxetex ifluatex eurosym listings fancyvrb + # longtable + booktabs + hyperref ulem geometry setspace + # linestretch + babel + # some optional dependencies of pandoc + upquote microtype csquotes + ; + }); }; } diff --git a/nix/.nixpkgs/ftb.nix b/nix/.nixpkgs/ftb.nix new file mode 100644 index 0000000..b5a0a95 --- /dev/null +++ b/nix/.nixpkgs/ftb.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, makeDesktopItem +, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm +, mesa, openal, pulseaudioLight }: + + stdenv.mkDerivation { + name = "ftb-1.4.12"; + src = fetchurl { + url = "http://ftb.cursecdn.com/FTB2/launcher/FTB_Launcher.jar"; + sha256 = "1wqpwqpfs646xarslxn81b62dj95h6ynz7p9379y7i68yzqhwp5c"; + }; + + phases = "installPhase"; + + installPhase = '' + set -x + mkdir -pv $out/bin + cp -v $src $out/ftblaunch.jar + 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 + EOF + chmod +x $out/bin/feedthebeast + ''; + + meta = { + description = "Modded minecraft launcher"; + homepage = http://www.feed-the-beast.com; + license = stdenv.lib.licenses.unfreeRedistributable; + }; +} \ No newline at end of file