Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 699fa7e953ca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4c2913215c9b
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 15, 2018

  1. staruml: 2.6.0 -> 2.8.1

    @steveej
    steveej committed May 15, 2018
    Copy the full SHA
    ac07f5a View commit details

  2. staruml: fix internal node binary 

    The internal node binary is at least used for exporting in various
picture formats and also PDF printing.
    @steveej
    steveej committed May 15, 2018
    Copy the full SHA
    2a21dbe View commit details

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

    staruml: 2.6.0 -> 2.8.1, fix internal node binary
    @xeji
    xeji authored May 15, 2018
    Copy the full SHA
    4c29132 View commit details
Showing with 13 additions and 12 deletions.
  1. +13 −12 pkgs/tools/misc/staruml/default.nix
25 changes: 13 additions & 12 deletions pkgs/tools/misc/staruml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{ 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.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 ];
@@ -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; {