Simplify nix shell environment

[factor.git] / shell.nix

diff --git a/shell.nix b/shell.nix
index 458964dc7ff7193b57d329bc1bc4d24d46ce205f..e1576d3cb12102e8967a62ebfe9f1922e51d559c 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,20 +1,27 @@
 { pkgs ? import <nixpkgs> {} }:
-(pkgs.buildFHSUserEnv {
-  name = "factor";
-  targetPkgs = pkgs: (with pkgs; [
-    # for running factor
-    gtk2-x11
+with pkgs;
+let
+  mkClangShell = mkShell.override { stdenv = clangStdenv; };
+  runtimeLibs = with xorg; [
     glib
+    pango cairo
+    gtk2-x11
     gdk_pixbuf
-    gnome2.pango
-    cairo
     gnome2.gtkglext
-
+    pcre
+    mesa_glu
+    freealut
+    openssl
+    udis86 # available since NixOS 19.09
+    openal
+  ];
+in
+(mkClangShell {
+  name = "factor-shell-env";
+  LD_LIBRARY_PATH = "/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}" ;
+  buildInputs = runtimeLibs ++ [
     # for building factor
-    clang
     git
     curl
-    binutils
-  ]);
-  runScript = "bash";
-}).env
+  ];
+})