From 9f8650f399491230fad44b0859a0ecc4fd8ae290 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 30 Jun 2018 04:28:30 +0200 Subject: [PATCH] Fix carnix --- home-manager/modules/rustdev.nix | 3 +-- home-manager/packages/rust-scripts/default.nix | 11 ++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/home-manager/modules/rustdev.nix b/home-manager/modules/rustdev.nix index 8a8889d9..cb1af30c 100644 --- a/home-manager/modules/rustdev.nix +++ b/home-manager/modules/rustdev.nix @@ -14,8 +14,7 @@ config = mkIf config.m-0.rustdev.enable { unstablePkgs.rustc gcc binutils-unwrapped - unstablePkgs.rustfmt -# rustPkgs.carnix + unstablePkgs.carnix ]; }; diff --git a/home-manager/packages/rust-scripts/default.nix b/home-manager/packages/rust-scripts/default.nix index 9b967b63..00ffb521 100644 --- a/home-manager/packages/rust-scripts/default.nix +++ b/home-manager/packages/rust-scripts/default.nix @@ -1 +1,10 @@ -{ pkgs, ... }: (pkgs.callPackage ./Cargo.nix {}).rust_scripts_0_1_0 {} +{ pkgs, defaultCrateOverrides, makeDesktopItem, ... }: +((pkgs.callPackage ./Cargo.nix {}).rust_scripts_0_1_0 {}).override { + crateOverrides = defaultCrateOverrides // { + rust-scripts = attrs: { + postInstall = '' + rm $out/lib/link + ''; + }; + }; +}