nur-packages

commit 42c93f70132f6a53accd27984093a1bf13fee28f
parent a640390a7ecfd0593c31f4f7a57d79f348f583f1
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Wed,  8 Jun 2022 14:06:19 +0300

Up

Diffstat:
M
pkgs/misc/cfiles/default.nix
 | 
15
++++++++-------
M
pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
 | 
13
++++++++-----

2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/pkgs/misc/cfiles/default.nix b/pkgs/misc/cfiles/default.nix
@@ -11,13 +11,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-Y5OOA0GGnjl4614zicuS00Wz2x5lLzhEHVioNFADQto=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ ncurses w3m ueberzug ];
-
-  prePatch = ''
-    substituteInPlace Makefile \
-      --replace "CC = gcc" "" \
-      --replace "prefix = usr" "prefix=$out"
+  postPatch = ''
     substituteInPlace scripts/clearimg \
       --replace "/usr/lib/w3m/w3mimgdisplay" "${w3m}/bin/w3mimgdisplay"
     substituteInPlace scripts/displayimg \
@@ -26,6 +20,13 @@ stdenv.mkDerivation rec {
       --replace "ueberzug" "${ueberzug}/bin/ueberzug"
   '';
 
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ ncurses w3m ueberzug ];
+
+  makeFlags = [ "CC:=$(CC)" ];
+
+  installFlags = [ "prefix=$(out)" ];
+
   meta = with lib; {
     description = "A ncurses file manager written in C with vim like keybindings";
     inherit (src.meta) homepage;
diff --git a/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix b/pkgs/misc/pvs-studio/how-to-use-pvs-studio-free.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }:
 
 stdenv.mkDerivation rec {
   pname = "how-to-use-pvs-studio-free";
@@ -11,14 +11,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-aFqk0WsMylRQqvlb+M5IfDHVwMBuKNQpCiiGPrj+jEw=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/viva64/how-to-use-pvs-studio-free/commit/5685a069d9538242a79d099fed3057de37a8d766.patch";
+      sha256 = "sha256-xffOthjpBVP1aijdO6LTnHNQ3pvrO0/W3YJWIWLMuuQ=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   postPatch = lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace CMakeLists.txt \
       --replace "set(CMAKE_INSTALL_PREFIX \"/usr\")" ""
-  '' + lib.optionalString stdenv.cc.isClang ''
-    substituteInPlace CMakeLists.txt \
-      --replace "stdc++fs" "c++fs"
   '';
 
   meta = with lib; {
@@ -27,6 +31,5 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     maintainers = [ maintainers.sikmir ];
     platforms = platforms.unix;
-    broken = stdenv.isDarwin;
   };
 }