movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

projectlibre: 1.9.3 -> 1.9.8, move to pkgs/by-name

Browse source
This commit is contained in:
TomaSajt 2025-05-09 01:45:56 +02:00
parent ad50b616f8
commit 56ddafb23c
No known key found for this signature in database
GPG key ID: F011163C050122A1
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkgs/applications/misc/projectlibre/default.nix → pkgs/by-name/pr/projectlibre/package.nix
View file

@ -2,30 +2,32 @@
lib, lib,
stdenv, stdenv,
fetchgit, fetchgit,
ant, ant,
jdk, jdk,
stripJavaArchivesHook,
makeWrapper, makeWrapper,
jre, stripJavaArchivesHook,
coreutils, coreutils,
jre,
which, which,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "projectlibre"; pname = "projectlibre";
version = "1.9.3"; version = "1.9.8";
src = fetchgit { src = fetchgit {
url = "https://git.code.sf.net/p/projectlibre/code"; url = "https://git.code.sf.net/p/projectlibre/code";
rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66"; # version 1.9.8 was not tagged
hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU="; hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
ant ant
jdk jdk
stripJavaArchivesHook
makeWrapper makeWrapper
stripJavaArchivesHook
]; ];
runtimeDeps = [ runtimeDeps = [
@ -34,8 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
which which
]; ];
env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
ant -f projectlibre_build/build.xml ant -f projectlibre_build/build.xml
@ -57,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
popd popd
substituteInPlace $out/bin/projectlibre \ substituteInPlace $out/bin/projectlibre \
--replace-fail "/usr/share/projectlibre" "$out/share/projectlibre" --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"
wrapProgram $out/bin/projectlibre \ wrapProgram $out/bin/projectlibre \
--prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps} --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}
runHook postInstall runHook postInstall
''; '';

5
pkgs/top-level/all-packages.nix
View file

@ -4259,11 +4259,6 @@ with pkgs;
polaris-web = callPackage ../servers/polaris/web.nix { }; polaris-web = callPackage ../servers/polaris/web.nix { };
projectlibre = callPackage ../applications/misc/projectlibre {
jre = jre8;
jdk = jdk8;
};
projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { }; projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };
proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { }; proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };