commit 7d4e04c7950196e26dad5067045eb8a4cb2718f2 · pyrox.dev/nixpkgs

+7 -5

pkgs/applications/graphics/xournal/default.nix

···

       13
       13
        
       

     

       14
       14
        
         buildInputs = [

     

       15
       15
        
           ghostscript atk gtk2 glib fontconfig freetype

     

       16
       16
       -
           libgnomecanvas libgnomeprint libgnomeprintui

     

       16
       16
       +
           libgnomecanvas

     

       17
       17
        
           pango libX11 xproto zlib poppler

     

       18
       18
       +
         ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [

     

       19
       19
       +
           libgnomeprint libgnomeprintui

     

       18
       20
        
         ];

     

       19
       21
        
       

     

       20
       22
        
         nativeBuildInputs = [ autoconf automake libtool pkgconfig ];

     
···

       47
       49
        
             cp $out/share/xournal/pixmaps/xournal.png $out/share/icons

     

       48
       50
        
         '';

     

       49
       51
        
       

     

       50
       50
       -
         meta = {

     

       52
       52
       +
         meta = with stdenv.lib; {

     

       51
       53
        
           homepage = http://xournal.sourceforge.net/;

     

       52
       54
        
           description = "Note-taking application (supposes stylus)";

     

       53
       53
       -
           maintainers = [ stdenv.lib.maintainers.guibert ];

     

       54
       54
       -
           license = stdenv.lib.licenses.gpl2;

     

       55
       55
       -
           platforms = stdenv.lib.platforms.linux;

     

       55
       55
       +
           maintainers = [ maintainers.guibert ];

     

       56
       56
       +
           license = licenses.gpl2;

     

       57
       57
       +
           platforms = with platforms; linux ++ darwin;

     

       56
       58
        
         };

     

       57
       59
        
       }

+7 -3

pkgs/development/libraries/gtk+/2.x.nix

···

       38
       38
        
           ++ optional xineramaSupport libXinerama

     

       39
       39
        
           ++ optionals cupsSupport [ cups ];

     

       40
       40
        
       

     

       41
       41
       -
         configureFlags = if stdenv.isDarwin

     

       42
       42
       -
           then "--disable-glibtest --disable-introspection --disable-visibility"

     

       43
       43
       -
           else "--with-xinput=yes";

     

       41
       41
       +
         configureFlags = [

     

       42
       42
       +
           "--with-xinput=yes"

     

       43
       43
       +
         ] ++ stdenv.lib.optionals stdenv.isDarwin [

     

       44
       44
       +
           "--disable-glibtest"

     

       45
       45
       +
           "--disable-introspection"

     

       46
       46
       +
           "--disable-visibility"

     

       47
       47
       +
         ];

     

       44
       48
        
       

     

       45
       49
        
         postInstall = ''

     

       46
       50
        
           moveToOutput share/gtk-2.0/demo "$devdoc"