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

libstrangle: 0.1.1 -> unstable-202202022

Browse Source
This commit is contained in:
Solene Rapenne 2022-04-17 12:25:04 +02:00 committed by ehmry
parent b263bfb91c
commit 922b173bf3
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/X11/libstrangle/default.nix
View File

@ -2,20 +2,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libstrangle"; pname = "libstrangle";
version = "0.1.1"; version = "unstable-202202022";
buildInputs = [ libGL libX11 ]; buildInputs = [ libGL libX11 ];
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "torkel104"; owner = "torkel104";
repo = pname; repo = pname;
rev = version; rev = "0273e318e3b0cc759155db8729ad74266b74cb9b";
sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w"; sha256 = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM=";
}; };
makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; makeFlags = [ "prefix=" "DESTDIR=$(out)" ];
patches = [ ./nixos.patch ]; patches = [
./nixos.patch
];
postPatch = '' postPatch = ''
substituteAllInPlace src/strangle.sh substituteAllInPlace src/strangle.sh

2
pkgs/tools/X11/libstrangle/nixos.patch
View File

@ -7,7 +7,7 @@ diff --git a/makefile b/makefile
-install-ld: ld -install-ld: ld
- install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf - install -m 0644 -D -T $(BUILDDIR)/libstrangle.conf $(DESTDIR)/etc/ld.so.conf.d/libstrangle.conf
- ldconfig - if [ -z "$(DESTDIR)" ]; then ldconfig; fi
- -
install-32: 32-bit install-32: 32-bit
install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so install -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so