From a69b14eecdfbf32610793d14b534726290c83fd1 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 1 Mar 2017 18:55:46 +0000 Subject: include libdrm and libpciaccess in Nix profile --- INSTALL.md | 10 +++++----- tweed.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 3e243f9..dccad2c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,5 +1,5 @@ # Tweed.INSTALL -Copyright © 2016 Paul Garlick <[pgarlick@tourbillion-technology.com](mailto:pgarlick@tourbillion-technology.com)> +Copyright © 2016, 2017 Paul Garlick <[pgarlick@tourbillion-technology.com](mailto:pgarlick@tourbillion-technology.com)> Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -110,10 +110,10 @@ necessary environment variables and runs the FreeCAD application: FONTCONFIG_PATH="$HOME/.nix-profile/etc/fonts/fonts.conf" \ LIBGL_DRIVERS_PATH="/usr/lib64/dri" \ LIB1="/lib64/libselinux.so.1" \ - LIB2="/usr/lib64/libdrm_radeon.so" \ - LIB3="/usr/lib64/libpciaccess.so.0" \ - LIB4="/usr/lib64/libdrm.so" \ - LIB5="/usr/lib64/libdrm_intel.so" \ + LIB2="$HOME/.nix-profile/lib/libdrm.so" \ + LIB3="$HOME/.nix-profile/lib/libdrm_intel.so" \ + LIB4="$HOME/.nix-profile/lib/libdrm_radeon.so" \ + LIB5="$HOME/.nix-profile/lib/libpciaccess.so.0" \ LD_PRELOAD=$LIB1:$LIB2:$LIB3:$LIB4:$LIB5 \ FreeCAD } diff --git a/tweed.nix b/tweed.nix index 0d2df98..6a45ee9 100644 --- a/tweed.nix +++ b/tweed.nix @@ -1,5 +1,5 @@ ;;; Tweed --- Package management for engineering software -;;; Copyright (C) 2016 Paul Garlick +;;; Copyright (C) 2016, 2017 Paul Garlick ;;; ;;; Tweed is free software: you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -16,4 +16,7 @@ with (import {}); -{ inherit fontconfig freecad; } +{ + inherit fontconfig freecad; + inherit libdrm libpciaccess; +} -- cgit