From 752789e973d75bced5d68cb51da5de3f810028b9 Mon Sep 17 00:00:00 2001 From: Smaug123 Date: Wed, 27 Oct 2021 20:28:12 +0100 Subject: [PATCH] Revert some GMP stuff --- config.nix | 8 -------- darwin-configuration.nix | 13 ++++++++----- gmp.nix | 14 ++++++++++++++ home.nix | 3 ++- result | 1 + 5 files changed, 25 insertions(+), 14 deletions(-) delete mode 100644 config.nix create mode 100644 gmp.nix create mode 120000 result diff --git a/config.nix b/config.nix deleted file mode 100644 index 3d9facb..0000000 --- a/config.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - packageOverrides = pkgs: { - gmp = pkgs.gmp.override { postInstall = '' - ln -s /usr/local/opt/gmp/lib/libgmp.10.dylib $out/lib/libgmp.10.dylib - ''; - }; - }; -} diff --git a/darwin-configuration.nix b/darwin-configuration.nix index e69b74c..2b417db 100644 --- a/darwin-configuration.nix +++ b/darwin-configuration.nix @@ -1,9 +1,13 @@ -{ config, lib, ... }: - -let pkgs = import { config = import ./config.nix; }; in +{ config, lib, pkgs, ... }: let python = import ./python.nix { inherit pkgs; }; in +let gmp = + #if pkgs.stdenv.isDarwin then + import ./gmp.nix { inherit pkgs; } + #else pkgs.gmp + ; in + { nix.useDaemon = true; @@ -22,8 +26,7 @@ let python = import ./python.nix { inherit pkgs; }; in pkgs.rustc pkgs.cargo pkgs.clang - pkgs.gmp - pkgs.darwin.apple_sdk.frameworks.Foundation + gmp python #pkgs.keepassxc ]; diff --git a/gmp.nix b/gmp.nix new file mode 100644 index 0000000..7c00014 --- /dev/null +++ b/gmp.nix @@ -0,0 +1,14 @@ +{ pkgs ? import {} }: + +# If this fails, `chmod -R a+rw /usr/local/opt/gmp/lib` +pkgs.stdenv.mkDerivation { + name = "gmp-symlink"; + builder = "${pkgs.bash}/bin/bash"; + args = ["-c" "${pkgs.coreutils}/bin/mkdir -p $out && ${pkgs.coreutils}/bin/touch $out/gmp-symlink"]; + system = "x86_64-darwin"; + postInstall = + '' + ${pkgs.coreutils}/bin/echo "hi!" + ${pkgs.coreutils}/bin/ln -s ${pkgs.gmp}/lib/libgmp.10.dylib /usr/local/opt/gmp/lib/libgmp.10.dylib + ''; +} diff --git a/home.nix b/home.nix index 6eb34a6..753dd27 100644 --- a/home.nix +++ b/home.nix @@ -35,6 +35,7 @@ pkgs.handbrake pkgs.ripgrep pkgs.elan + pkgs.coreutils-prefixed ]; programs.vscode = { @@ -111,7 +112,7 @@ let g:syntastic_always_populate_loc_list = 1 let g:syntastic_auto_loc_list = 1 let g:syntastic_check_on_open = 1 let g:syntastic_check_on_wq = 0''; } - + YouCompleteMe tagbar ]; diff --git a/result b/result new file mode 120000 index 0000000..dd871de --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/gfc3ba816plnkzix49frmjg0729h58rn-gmp-symlink \ No newline at end of file