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

Merge pull request #40551 from steveeJ/steveej-staruml-bump-n-fix

Browse Source 
staruml: 2.6.0 -> 2.8.1, fix internal node binary
This commit is contained in:
xeji 2018-05-15 15:29:38 +02:00 committed by GitHub
commit 4c2913215c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/tools/misc/staruml/default.nix
View File

@ -1,23 +1,24 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, dpkg, patchelf , 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 let
inherit (stdenv) lib; inherit (stdenv) lib;
LD_LIBRARY_PATH = lib.makeLibraryPath 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.6.0"; version = "2.8.1";
name = "staruml-${version}"; name = "staruml-${version}";
src = src =
if stdenv.system == "i686-linux" then fetchurl { if stdenv.system == "i686-linux" then fetchurl {
url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb"; url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849"; sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
} else fetchurl { } else fetchurl {
url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb"; url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d"; sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
}; };
buildInputs = [ dpkg ]; buildInputs = [ dpkg ];
@ -34,17 +35,17 @@ stdenv.mkDerivation rec {
mkdir $out mkdir $out
mv opt/staruml $out/bin mv opt/staruml $out/bin
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/bin/StarUML
mkdir -p $out/lib mkdir -p $out/lib
ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $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 ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
wrapProgram $out/bin/StarUML \ 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} --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {