diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-05-16 16:31:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 16:31:25 +0200 |
commit | 685d60c3832206d28fef0eadf2cc0849ca22dd7b (patch) | |
tree | b044050e4b509f667c7e98021a0c5fda1a91bd49 /pkgs | |
parent | 380cdd8dd71398721909cd7560f8d0ded44abe21 (diff) | |
parent | 80ea03ee79e66fc1ebbe48ac36d02fd82b880171 (diff) | |
download | nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar.gz nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar.bz2 nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar.lz nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar.xz nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.tar.zst nixlib-685d60c3832206d28fef0eadf2cc0849ca22dd7b.zip |
Merge pull request #40020 from Hodapp87/draftsight2018
draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/graphics/draftsight/default.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index b604099096ff..d817424c4525 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -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, - xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, + xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libXrender, libXcomposite }: -let version = "2017-SP2"; in +let version = "2018SP2"; in stdenv.mkDerivation { name = "draftsight-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { $out/bin/$exe \ --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb" 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 if [ -f $(readlink -f $lib) ] then @@ -41,6 +41,19 @@ stdenv.mkDerivation { echo "Ignoring broken link $lib" fi 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. @@ -51,15 +64,15 @@ stdenv.mkDerivation { # that it dlopen()'s libraries in paths removed by shrinking RPATH. dontPatchELF = true; - src = requireFile { + src = fetchurl { name = "draftSight.deb"; - url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0"; - sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; + url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb"; + sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx"; }; libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils 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 libXcomposite ]; |