From 922b173bf33443ad2572d765df74579fcbf46360 Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sun, 17 Apr 2022 12:25:04 +0200 Subject: [PATCH] libstrangle: 0.1.1 -> unstable-202202022 --- pkgs/tools/X11/libstrangle/default.nix | 10 ++++++---- pkgs/tools/X11/libstrangle/nixos.patch | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index 2d7f6b456c4..64992a9b5ee 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "libstrangle"; - version = "0.1.1"; + version = "unstable-202202022"; buildInputs = [ libGL libX11 ]; src = fetchFromGitLab { owner = "torkel104"; repo = pname; - rev = version; - sha256 = "135icr544w5ynlxfnxqgjn794bsm9i703rh9jfnracjb7jgnha4w"; + rev = "0273e318e3b0cc759155db8729ad74266b74cb9b"; + sha256 = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM="; }; makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; - patches = [ ./nixos.patch ]; + patches = [ + ./nixos.patch + ]; postPatch = '' substituteAllInPlace src/strangle.sh diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch index 05364028e3e..c23a76f4e20 100644 --- a/pkgs/tools/X11/libstrangle/nixos.patch +++ b/pkgs/tools/X11/libstrangle/nixos.patch @@ -7,7 +7,7 @@ diff --git a/makefile b/makefile -install-ld: ld - 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 -m 0755 -D -T $(BUILDDIR)/libstrangle32.so $(DESTDIR)$(LIB32_PATH)/libstrangle.so