Merge pull request #425 from madjar/patch-1

Make sure we don't use the pinned nixpkgs if another one is provided

Author: srid

project.nix

@@ -7,6 +7,7 @@ let
   nixpkgs = import sources.nixpkgs {};
 in {
   pkgs ? nixpkgs,
+  pkgsForBins ? null,
   neuronFlags ? [],
   disableHsLuaTests ? false,
   withHoogle ? false,
@@ -35,7 +36,7 @@ let
     cp $src/src-bash/neuron-search $out/bin/neuron-search
     chmod +x $out/bin/neuron-search
     wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${
-      with nixpkgs;
+      with (if pkgsForBins != null then pkgsForBins else pkgs);
       lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ]
     }
     PATH=$PATH:$out/bin

static.nix

@@ -6,6 +6,9 @@ let
 in 
   (import ./project.nix { 
     inherit pkgs;
+    # We have to use original nixpkgs for fzf, etc. otherwise this will give
+    #   error: missing bootstrap url for platform x86_64-unknown-linux-musl
+    pkgsForBins = import sources.nixpkgs {};
     disableHsLuaTests = true; 
     neuronFlags = [
       "--ghc-option=-optl=-static"