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: 32780dc7ac40
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05d3d71967d7
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 28, 2019

  1. staruml: fix dependency libexpat.so.1

    @oxalica
    oxalica committed Apr 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b85bbf View commit details

  2. staruml: mark dpkg as nativeBuildInputs

    @oxalica
    oxalica committed Apr 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    544c667 View commit details

  3. Merge pull request #60370 from uHOOCCOOHu/fix/staruml-deps 

    staruml: fix dependency libexpat.so.1
    @c0bw3b
    c0bw3b authored Apr 28, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: 003F2096411B5F92
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05d3d71 View commit details
Showing with 3 additions and 5 deletions.
  1. +3 −5 pkgs/tools/misc/staruml/default.nix
8 changes: 3 additions & 5 deletions pkgs/tools/misc/staruml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper
, dpkg, patchelf
, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
, libXdamage }:
, libXdamage, expat }:

let
inherit (stdenv) lib;
LD_LIBRARY_PATH = lib.makeLibraryPath
[ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage ];
[ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
in
stdenv.mkDerivation rec {
version = "2.8.1";
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
};

buildInputs = [ dpkg ];

nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper dpkg ];

unpackPhase = ''
mkdir pkg