public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer

Browse Source 
Also, fixed URL scheme to link directly.

Addressing https://github.com/NixOS/nixpkgs/issues/39975
This commit is contained in:
Chris Hodapp 2018-05-05 21:41:54 -04:00
parent 67ef59fd26
commit 80ea03ee79
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/graphics/draftsight/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, { stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
libXrender, libXcomposite }: libXrender, libXcomposite }:
let version = "2017-SP2"; in let version = "2018SP2"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "draftsight-${version}"; name = "draftsight-${version}";
@ -31,7 +31,7 @@ stdenv.mkDerivation {
$out/bin/$exe \ $out/bin/$exe \
--prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
done done
for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do
# DraftSight ships with broken symlinks for some reason # DraftSight ships with broken symlinks for some reason
if [ -f $(readlink -f $lib) ] if [ -f $(readlink -f $lib) ]
then then
@ -41,6 +41,19 @@ stdenv.mkDerivation {
echo "Ignoring broken link $lib" echo "Ignoring broken link $lib"
fi fi
done done
for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do
if [ -f $(readlink $lib) ]
then
echo "Patching $lib..."
chmod u+w $lib
patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
else
echo "Ignoring broken link $lib"
fi
done
# These libraries shouldn't really be here anyway:
find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \
-type d -name _lib | xargs rm -r
''; '';
# TODO: Figure out why HelpGuide segfaults at startup. # TODO: Figure out why HelpGuide segfaults at startup.
@ -51,15 +64,15 @@ stdenv.mkDerivation {
# that it dlopen()'s libraries in paths removed by shrinking RPATH. # that it dlopen()'s libraries in paths removed by shrinking RPATH.
dontPatchELF = true; dontPatchELF = true;
src = requireFile { src = fetchurl {
name = "draftSight.deb"; name = "draftSight.deb";
url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0"; url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb";
sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
}; };
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcursor libXrandr libxcb libXi libSM libICE libXrender
libXcomposite ]; libXcomposite ];