update nixos
This commit is contained in:
parent
03cfefecfd
commit
e47d2db90f
|
@ -16,17 +16,24 @@
|
||||||
let
|
let
|
||||||
mkEnv = name: paths: pkgs.buildEnv { inherit name paths; };
|
mkEnv = name: paths: pkgs.buildEnv { inherit name paths; };
|
||||||
py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages;
|
py3 = python35Packages; hs = haskellPackages; js = nodePackages; ml = ocamlPackages;
|
||||||
py2 = python27Packages;
|
py2 = python27Packages; emc = emacsPackages; emcn = emacsPackagesNg;
|
||||||
in rec {
|
in rec {
|
||||||
org = pkgs.emacsPackages.org.overrideDerivation (attrs: {
|
org = pkgs.emacsPackages.org.overrideDerivation (attrs: {
|
||||||
nativeBuildInputs = [emacs texinfo tetex]; });
|
nativeBuildInputs = [emacs texinfo tetex]; });
|
||||||
|
|
||||||
firefox-bin-wrapper = wrapFirefox firefox-bin {};
|
|
||||||
|
|
||||||
wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
||||||
|
|
||||||
ftb = pkgs.callPackage ./ftb.nix {};
|
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 {
|
envs = recurseIntoAttrs {
|
||||||
|
|
||||||
|
@ -44,14 +51,18 @@
|
||||||
pavucontrol
|
pavucontrol
|
||||||
];
|
];
|
||||||
apps = mkEnv "y-apps" [
|
apps = mkEnv "y-apps" [
|
||||||
|
gajim
|
||||||
|
mutt
|
||||||
|
torbrowser
|
||||||
# chromium
|
# chromium
|
||||||
firefox-bin-wrapper
|
firefox-bin
|
||||||
gimp
|
gimp
|
||||||
hexchat
|
hexchat
|
||||||
#inkscape
|
#inkscape
|
||||||
keepassx
|
keepassx
|
||||||
# libreoffice
|
# libreoffice
|
||||||
skype
|
(builtins.storePath /nix/store/g6v35jgh2ik8fq9bjh4yac36aj8bd1h5-skype-4.3.0.37)
|
||||||
|
# skype
|
||||||
spotify
|
spotify
|
||||||
kde4.quasselClientWithoutKDE
|
kde4.quasselClientWithoutKDE
|
||||||
sublime3
|
sublime3
|
||||||
|
@ -89,8 +100,11 @@
|
||||||
openssl
|
openssl
|
||||||
sshfsFuse
|
sshfsFuse
|
||||||
sshuttle iodine stow
|
sshuttle iodine stow
|
||||||
|
expect
|
||||||
];
|
];
|
||||||
|
|
||||||
|
emacs = mkEnv "y-emacs" [emacs org emcn.smex emc.colorThemeSolarized];
|
||||||
|
|
||||||
code = mkEnv "y-code" [
|
code = mkEnv "y-code" [
|
||||||
cloc graphviz sloccount silver-searcher
|
cloc graphviz sloccount silver-searcher
|
||||||
gnumake strace stack # hs?
|
gnumake strace stack # hs?
|
||||||
|
@ -111,7 +125,8 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
games = mkEnv "y-games" [
|
games = mkEnv "y-games" [
|
||||||
steam openttd wine winetricks minecraft
|
# steam openttd wine winetricks minecraft
|
||||||
|
openttd minecraft ftb
|
||||||
];
|
];
|
||||||
|
|
||||||
js = mkEnv "y-jsdev" [
|
js = mkEnv "y-jsdev" [
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
{ stdenv, fetchurl, makeDesktopItem
|
{ stdenv, lib, fetchurl, makeDesktopItem
|
||||||
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
|
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
|
||||||
, mesa, openal, pulseaudioLight }:
|
, mesa, openal, pulseaudioLight }:
|
||||||
|
|
||||||
|
let
|
||||||
|
lib_path = lib.concatMapStringsSep ":" (x: x.out + "/lib/") [libX11 libXext libXcursor libXrandr libXxf86vm mesa openal];
|
||||||
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "ftb-1.4.12";
|
name = "ftb-1.4.12";
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -18,8 +21,8 @@
|
||||||
cat > $out/bin/feedthebeast << EOF
|
cat > $out/bin/feedthebeast << EOF
|
||||||
#!${stdenv.shell}
|
#!${stdenv.shell}
|
||||||
# wrapper for minecraft
|
# wrapper for minecraft
|
||||||
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
|
export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${lib_path}
|
||||||
${pulseaudioLight}/bin/padsp ${jre}/bin/java -jar $out/ftblaunch.jar
|
${pulseaudioLight.out}/bin/padsp ${jre}/bin/java -jar $out/ftblaunch.jar
|
||||||
EOF
|
EOF
|
||||||
chmod +x $out/bin/feedthebeast
|
chmod +x $out/bin/feedthebeast
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue