From ac07f5acf601e4dd44e7f1f6b3f8a03a244d939b Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 15 May 2018 14:56:43 +0200 Subject: [PATCH 1/2] staruml: 2.6.0 -> 2.8.1 --- pkgs/tools/misc/staruml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index e1d6604970e5..ef3fd53c4ecb 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -8,16 +8,16 @@ let [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ]; in stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.8.1"; name = "staruml-${version}"; src = if stdenv.system == "i686-linux" then fetchurl { url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb"; - sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849"; + sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; } else fetchurl { url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb"; - sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d"; + sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; }; buildInputs = [ dpkg ]; From 2a21dbe0597ef3f8b5340cc028327378411f0814 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Tue, 15 May 2018 14:57:18 +0200 Subject: [PATCH 2/2] staruml: fix internal node binary The internal node binary is at least used for exporting in various picture formats and also PDF printing. --- pkgs/tools/misc/staruml/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index ef3fd53c4ecb..2a06400b411f 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }: +, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd +, libXdamage }: let inherit (stdenv) lib; LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ]; + [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage ]; in stdenv.mkDerivation rec { version = "2.8.1"; @@ -34,17 +35,17 @@ stdenv.mkDerivation rec { mkdir $out mv opt/staruml $out/bin - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/StarUML - mkdir -p $out/lib - ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 - wrapProgram $out/bin/StarUML \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} + for binary in StarUML Brackets-node; do + ${patchelf}/bin/patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/$binary + wrapProgram $out/bin/$binary \ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} + done ''; meta = with stdenv.lib; {