Merge pull request #131944 from SuperSandro2000/cleanup (dbe50548) · Commits · nix / nixpkgs

pkgs/applications/networking/sync/unison/default.nix

+39 −27

Original line number	Diff line number	Diff line
		{lib, stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep, fetchpatch, copyDesktopItems, makeDesktopItem
		, enableX11 ? true}:

		let inherit (ocamlPackages) ocaml lablgtk; in

		stdenv.mkDerivation (rec {
		{ lib
		, stdenv
		, fetchFromGitHub
		, ocamlPackages
		, fontschumachermisc
		, xset
		, makeWrapper
		, ncurses
		, gnugrep
		, fetchpatch
		, copyDesktopItems
		, makeDesktopItem
		, enableX11 ? true
		}:

		stdenv.mkDerivation rec {
		pname = "unison";
		version = "2.51.3";

		src = fetchFromGitHub {
		owner = "bcpierce00";
		repo = "unison";
		@@ -14,8 +24,9 @@ stdenv.mkDerivation (rec {
		sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y=";
		};

		nativeBuildInputs = [ makeWrapper ] ++ (lib.lists.optional enableX11 copyDesktopItems);
		buildInputs = [ ocaml ncurses ];
		nativeBuildInputs = [ makeWrapper ]
		++ lib.optional enableX11 copyDesktopItems;
		buildInputs = [ ocamlPackages.ocaml ncurses ];

		patches = [
		# Patch to fix build with ocaml 4.12. Remove in 2.51.4
		@@ -27,20 +38,22 @@ stdenv.mkDerivation (rec {
		})
		];

		preBuild = (lib.strings.optionalString enableX11 ''
		sed -i "s\|$OCAMLOPT=.$$\|\1 -I $(echo "${lablgtk}"/lib/ocaml//site-lib/lablgtk2)\|" src/Makefile.OCaml
		'') + ''
		preBuild = lib.optionalString enableX11 ''
		sed -i "s\|$OCAMLOPT=.$$\|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml//site-lib/lablgtk2)\|" src/Makefile.OCaml
		'' + ''
		echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile
		'';

		makeFlags = [
		"INSTALLDIR=$(out)/bin/"
		"UISTYLE=${if enableX11 then "gtk2" else "text"}"
		] ++ lib.optional (!ocaml.nativeCompilers) "NATIVE=false";
		] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false";

		preInstall = "mkdir -p $out/bin";
		preInstall = ''
		mkdir -p $out/bin
		'';

		postInstall = lib.strings.optionalString enableX11 ''
		postInstall = lib.optionalString enableX11 ''
		for i in $(cd $out/bin && ls); do
		wrapProgram $out/bin/$i \
		--run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q \| ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" \|\| ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")"
		@@ -49,9 +62,9 @@ stdenv.mkDerivation (rec {
		install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg
		'';

		dontStrip = !ocaml.nativeCompilers;
		dontStrip = !ocamlPackages.ocaml.nativeCompilers;

		desktopItems = lib.lists.optional enableX11 (makeDesktopItem {
		desktopItems = lib.optional enableX11 (makeDesktopItem {
		name = pname;
		desktopName = "Unison";
		comment = "Bidirectional file synchronizer";
		@@ -66,12 +79,11 @@ stdenv.mkDerivation (rec {
		};
		});

		meta = {
		meta = with lib; {
		homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
		description = "Bidirectional file synchronizer";
		license = lib.licenses.gpl3Plus;
		maintainers = with lib.maintainers; [viric];
		platforms = with lib.platforms; unix;
		license = licenses.gpl3Plus;
		maintainers = with maintainers; [ viric ];
		platforms = platforms.unix;
		};

		})
		}

pkgs/development/libraries/khronos-ocl-icd-loader/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
		sha256 = "0v2yi6d3g5qshzy6pjic09c5irwgds106yvr93q62f32psfblnmy";
		};

		patches = lib.lists.optional withTracing ./tracing.patch;
		patches = lib.optional withTracing ./tracing.patch;

		nativeBuildInputs = [ cmake ];
		buildInputs = [ opencl-headers ];

pkgs/development/libraries/libayatana-appindicator/default.nix

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
		nativeBuildInputs = [ pkg-config autoreconfHook gtk-doc gobject-introspection dbus-glib ];

		buildInputs =
		lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2
		++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3;
		lib.optional (gtkVersion == "2") libayatana-indicator-gtk2
		++ lib.optional (gtkVersion == "3") libayatana-indicator-gtk3;

		propagatedBuildInputs =
		lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
		++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];
		lib.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ]
		++ lib.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ];

		preAutoreconf = ''
		gtkdocize

pkgs/development/libraries/libayatana-indicator/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
		nativeBuildInputs = [ pkg-config autoreconfHook ];

		buildInputs = [ ayatana-ido ]
		++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ]
		++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ];
		++ lib.optionals (gtkVersion == "2") [ gtk2 ]
		++ lib.optionals (gtkVersion == "3") [ gtk3 ];

		configureFlags = [ "--with-gtk=${gtkVersion}" ];

pkgs/development/python-modules/bootstrapped-pip/2.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {

		dontBuild = true;

		installPhase = lib.strings.optionalString (!stdenv.hostPlatform.isWindows) ''
		installPhase = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
		export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
		'' + ''
		# Give folders a known name