commit 4daf37744d29569afc071d23c7bd4dd5627f3be6 · pyrox.dev/nixpkgs

+10 -10

pkgs/applications/misc/projectlibre/default.nix pkgs/by-name/pr/projectlibre/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         fetchgit,

     

       5
       5
       +
       

     

       5
       6
        
         ant,

     

       6
       7
        
         jdk,

     

       8
       8
       +
         makeWrapper,

     

       7
       9
        
         stripJavaArchivesHook,

     

       8
       8
       -
         makeWrapper,

     

       9
       9
       -
         jre,

     

       10
       10
       +
       

     

       10
       11
        
         coreutils,

     

       12
       12
       +
         jre,

     

       11
       13
        
         which,

     

       12
       14
        
       }:

     

       13
       15
        
       

     

       14
       16
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       17
        
         pname = "projectlibre";

     

       16
       16
       -
         version = "1.9.3";

     

       18
       18
       +
         version = "1.9.8";

     

       17
       19
        
       

     

       18
       20
        
         src = fetchgit {

     

       19
       21
        
           url = "https://git.code.sf.net/p/projectlibre/code";

     

       20
       20
       -
           rev = "20814e88dc83694f9fc6780c2550ca5c8a87aa16"; # version 1.9.3 was not tagged

     

       21
       21
       -
           hash = "sha256-yXgYyy3jWxYMXKsNCRWdO78gYRmjKpO9U5WWU6PtwMU=";

     

       22
       22
       +
           rev = "0530be227f4a10c5545cce8d3db20ac5a4d76a66"; # version 1.9.8 was not tagged

     

       23
       23
       +
           hash = "sha256-eGoPtHy1XfPLnJXNDOMcek4spNKkNyZdby0IsZFZfME=";

     

       22
       24
        
         };

     

       23
       25
        
       

     

       24
       26
        
         nativeBuildInputs = [

     

       25
       27
        
           ant

     

       26
       28
        
           jdk

     

       27
       27
       -
           stripJavaArchivesHook

     

       28
       29
        
           makeWrapper

     

       30
       30
       +
           stripJavaArchivesHook

     

       29
       31
        
         ];

     

       30
       32
        
       

     

       31
       33
        
         runtimeDeps = [

     
···

       33
       35
        
           coreutils

     

       34
       36
        
           which

     

       35
       37
        
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         env.JAVA_TOOL_OPTIONS = "-Dfile.encoding=UTF8";

     

       38
       38
        
       

     

       39
       39
        
         buildPhase = ''

     

       40
       40
        
           runHook preBuild

     
···

       57
       57
        
           popd

     

       58
       58
        
       

     

       59
       59
        
           substituteInPlace $out/bin/projectlibre \

     

       60
       60
       -
               --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"

     

       60
       60
       +
             --replace-fail "/usr/share/projectlibre" "$out/share/projectlibre"

     

       61
       61
        
       

     

       62
       62
        
           wrapProgram $out/bin/projectlibre \

     

       63
       63
       -
               --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}

     

       63
       63
       +
             --prefix PATH : ${lib.makeBinPath finalAttrs.runtimeDeps}

     

       64
       64
        
       

     

       65
       65
        
           runHook postInstall

     

       66
       66
        
         '';

-5

pkgs/top-level/all-packages.nix

···

       4234
       4234
        
       

     

       4235
       4235
        
         polaris-web = callPackage ../servers/polaris/web.nix { };

     

       4236
       4236
        
       

     

       4237
       4237
       -
         projectlibre = callPackage ../applications/misc/projectlibre {

     

       4238
       4238
       -
           jre = jre8;

     

       4239
       4239
       -
           jdk = jdk8;

     

       4240
       4240
       -
         };

     

       4241
       4241
       -
       

     

       4242
       4237
        
         projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };

     

       4243
       4238
        
       

     

       4244
       4239
        
         proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };