diff --git a/common.nix b/common.nix index 591c8e5..6d3209f 100644 --- a/common.nix +++ b/common.nix @@ -85,15 +85,19 @@ cabal2nix cabal-install # ghc-mod - ]; + + # emacs + emacs + ghostscript # for auctex + aspell + ] ++ (with aspellDicts; [ en de fr nl ]); nixpkgs.config.packageOverrides = pkgs: rec { - # libreoffice = pkgs.libreoffice.override { jdk = pkgs.jdk; }; # reuse package cache - jre = pkgs.openjdk8; - jdk = pkgs.openjdk8; i3 = pkgs.stdenv.lib.overrideDerivation pkgs.i3 (oldAttrs: { doCheck = false; }); }; + nixpkgs.config.allowTexliveBuilds = true; + environment.variables.EDITOR = "${pkgs.vim}/bin/vim"; # Enable the OpenSSH daemon. diff --git a/i3.nix b/i3.nix index 406aca4..8d7c90e 100644 --- a/i3.nix +++ b/i3.nix @@ -50,6 +50,7 @@ name = "i3wm"; start = '' export $(${pkgs.gnome3.gnome_keyring}/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) + export XDG_CURRENT_DESKTOP=GNOME ${pkgs.gnome3.gnome_settings_daemon}/libexec/gnome-settings-daemon-localeexec & ${pkgs.i3}/bin/i3 & waitPID=$! diff --git a/pkgs/yourkit.nix b/pkgs/yourkit.nix index d01d22a..4452198 100644 --- a/pkgs/yourkit.nix +++ b/pkgs/yourkit.nix @@ -1,19 +1,20 @@ with import {}; stdenv.mkDerivation rec { name = "yjp-${version}"; - version = "2015-build-15056"; + version = "2015-build-15062"; src = fetchzip { - url = https://www.yourkit.com/download/yjp-2015-build-15056.zip; - sha256 = "0y3d3fs91w0qbdvbm4nr02rmkbqmndl7j4rhxwzibs815ci659jn"; + url = "https://www.yourkit.com/download/${name}.zip"; + sha256 = "0dwfha6vid4nq21zm74v248yr83wpjfs1dd7ga8gykbs4insp66q"; }; - buildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ unzip makeWrapper patchelf ]; installPhase = '' mkdir -p $out cp -ra ./ $out/yjp chmod +x $out/yjp/bin/*/yjp_dc + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/yjp/bin/linux-x86-64/yjp_dc makeWrapper $out/yjp/bin/yjp.sh $out/bin/yjp \ --prefix PATH : ${jdk} ''; diff --git a/theba.nix b/theba.nix index 1883b8a..c435b23 100644 --- a/theba.nix +++ b/theba.nix @@ -37,6 +37,6 @@ networking.hostName = "theba"; # Define your hostname. networking.hostId = "b29b900f"; - services.colord.enable = true; + # services.colord.enable = true; }