Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions pkgs/applications/audio/ncmpc/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
, mpd_clientlib, gettext }:

let
rpath = stdenv.lib.makeLibraryPath [
glib ncurses mpd_clientlib
];
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
version = "0.28";

Expand All @@ -19,12 +15,6 @@ in stdenv.mkDerivation rec {
buildInputs = [ glib ncurses mpd_clientlib ];
nativeBuildInputs = [ meson ninja pkgconfig gettext ];

postFixup = ''
for elf in "$out"/bin/*; do
patchelf --set-rpath '${rpath}':"$out/lib" "$elf"
done
'';

meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
Expand Down
16 changes: 1 addition & 15 deletions pkgs/development/libraries/appstream-glib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@
, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
, libuuid, json_glib, autoconf-archive, meson, gperf, ninja, gdk_pixbuf
}:
let rpath = stdenv.lib.makeLibraryPath
[ libuuid.out
glib
libsoup
gdk_pixbuf
libarchive.lib
gcab
];
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "appstream-glib-0.7.2";

src = fetchFromGitHub {
Expand All @@ -28,12 +20,6 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [ gtk3 ];
mesonFlags = [ "-Denable-rpm=false" "-Denable-stemmer=false" "-Denable-dep11=false" ];

postFixup = ''
for elf in "$out"/bin/* "$out"/lib/*.so; do
patchelf --set-rpath '${rpath}':"$out/lib" "$elf"
done
'';

meta = with stdenv.lib; {
description = "Objects and helper methods to read and write AppStream metadata";
homepage = https://github.com/hughsie/appstream-glib;
Expand Down
5 changes: 0 additions & 5 deletions pkgs/tools/filesystems/sshfs-fuse/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

let
inherit (stdenv.lib) optional;
rpath = stdenv.lib.makeLibraryPath [ fuse3 glib ];
in stdenv.mkDerivation rec {
version = "3.3.1";
name = "sshfs-fuse-${version}";
Expand All @@ -30,10 +29,6 @@ in stdenv.mkDerivation rec {
ln -sf $out/bin/sshfs $out/sbin/mount.sshfs
'';

postFixup = ''
patchelf --set-rpath '${rpath}' "$out/bin/sshfs"
'';

meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
Expand Down